Merge branch 'master' into 254-download-files
# Conflicts: # app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
This commit is contained in:
commit
3a481084b6
# Conflicts: # app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java