Christian Schabesberger 8adca3725d solve merge conflict

2018-02-14 21:06:20 +01:00

..

src

solve merge conflict

2018-02-14 21:06:20 +01:00

.gitignore

New version number 0.6.0 and some fixes:

2015-11-10 20:51:39 +01:00

build.gradle

solve merge conflict

2018-02-14 21:06:20 +01:00

proguard-rules.pro

Add icepicker proguard rules

2017-10-08 17:52:12 +02:00