Jedi Burrell 2000944d68 Merge remote-tracking branch 'refs/remotes/k0shk0sh/master' ...

# Conflicts:
#	app/src/main/res/layouts/main_layouts/layout/login_chooser_layout.xml

2017-05-23 13:22:03 -04:00

..

src

Merge remote-tracking branch 'refs/remotes/k0shk0sh/master'

2017-05-23 13:22:03 -04:00

.gitignore

initializing repo.

2017-02-19 02:26:44 +08:00

build.gradle

Update Profile Layout.

2017-05-23 13:15:52 -04:00

proguard-rules.pro

fixing progaurd releasing production.

2017-04-23 15:40:39 +08:00