misaochan a9ae072c73 Merge remote-tracking branch 'refs/remotes/commons-app/master' into upload-overhaul-fork ... # Conflicts: # app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java		2018-06-05 18:28:41 +10:00
..
nrw/commons	Merge remote-tracking branch 'refs/remotes/commons-app/master' into upload-overhaul-fork	2018-06-05 18:28:41 +10:00