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
This commit is contained in:
misaochan 2018-06-05 18:28:41 +10:00
commit a9ae072c73
28 changed files with 415 additions and 35 deletions

View file

@ -20,6 +20,7 @@ import java.io.File;
import javax.inject.Inject;
import javax.inject.Named;
import fr.free.nrw.commons.BuildConfig;
import fr.free.nrw.commons.auth.SessionManager;
import fr.free.nrw.commons.category.CategoryDao;
import fr.free.nrw.commons.contributions.ContributionDao;