Xineroks 22ba2f21c7 Merge remote-tracking branch 'refs/remotes/origin/master' ...

Conflicts:
	mobile/src/main/AndroidManifest.xml
	mobile/src/main/java/htdinc/howtodrink/MainActivity.java
	mobile/src/main/res/layout/activity_main.xml

2016-06-01 09:24:36 +02:00

..

src

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

2016-06-01 09:24:36 +02:00

.gitignore

First project commit

2016-05-30 15:12:16 +02:00

build.gradle

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

2016-06-01 09:24:36 +02:00

proguard-rules.pro

First project commit

2016-05-30 15:12:16 +02:00