You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		8 years ago
..
src	Merge remote-tracking branch 'refs/remotes/origin/master'	8 years ago
.gitignore	First project commit	8 years ago
build.gradle	Merge remote-tracking branch 'refs/remotes/origin/master'	8 years ago
proguard-rules.pro	First project commit	8 years ago