Jedi Burrell ab15e23164 Merge remote-tracking branch 'refs/remotes/k0shk0sh/master'
# Conflicts:
#	app/src/main/java/com/fastaccess/ui/modules/editor/EditorActivity.java
#	app/src/main/java/com/fastaccess/ui/modules/splash/SplashActivity.java

#	app/src/main/java/com/fastaccess/ui/modules/splash/SplashActivityDark.java
2017-05-11 00:56:51 -04:00
..