Christian Schabesberger f451f1f65d resolve conflict		2018-01-20 18:06:34 +01:00
..
src	resolve conflict	2018-01-20 18:06:34 +01:00
.gitignore	New version number 0.6.0 and some fixes:	2015-11-10 20:51:39 +01:00
build.gradle	move on to v0.11.5	2018-01-20 16:00:39 +01:00
proguard-rules.pro	Add icepicker proguard rules	2017-10-08 17:52:12 +02:00