Christian Schabesberger fba3ece688 resolve conflict

2017-11-16 12:20:03 +01:00

..

src

resolve conflict

2017-11-16 12:20:03 +01:00

.gitignore

New version number 0.6.0 and some fixes:

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

build.gradle

update support lib to 27.0.1

2017-11-10 21:31:19 +01:00

proguard-rules.pro

Add icepicker proguard rules

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