Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolved conflicts - Fixed issue #812 #876

Closed
wants to merge 4 commits into from
Closed

Resolved conflicts - Fixed issue #812 #876

wants to merge 4 commits into from

Commits on Aug 10, 2017

  1. Fixed issue commons-app#812

    @ftsalamp
    ftsalamp committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    6ae7d62 View commit details
    Browse the repository at this point in the history

  2. Fixed issue commons-app#812

    @ftsalamp
    ftsalamp committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    5f5268b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' 

    Conflicts:
	app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
	app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
	app/src/main/res/values/strings.xml
    @ftsalamp
    ftsalamp committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    22ff940 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2017

  1. Resolved merge conflicts

    @neslihanturan
    neslihanturan committed Sep 12, 2017
    Configuration menu
    Copy the full SHA
    e6bbf51 View commit details
    Browse the repository at this point in the history