apps-android-commons/app/src
Josephine Lim 485a0a1bc3 Merge remote-tracking branch 'refs/remotes/commons-app/master' into display_toast
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
2017-05-15 11:23:10 +02:00
..
androidTest/java/fr/free/nrw/commons Update SettingsActivityTest to correctly pass test on LicenseSpinner 2017-05-10 23:15:15 +01:00
debug/res/values Place placeholder strings in separate strings xml file 2017-03-10 22:00:29 +00:00
main Merge remote-tracking branch 'refs/remotes/commons-app/master' into display_toast 2017-05-15 11:23:10 +02:00
test/java/fr/free/nrw/commons Rename and refactor tests 2017-04-25 09:30:47 +09:00