Alinson Xavier 5ccd546958 Merge branch 'dev' of git://github.com/TruffelNL/uhabits into dev ... # Conflicts: # uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt		2017-11-14 21:45:56 -06:00
..
src	Merge branch 'dev' of git://github.com/TruffelNL/uhabits into dev	2017-11-14 21:45:56 -06:00
build.gradle	Only use signing configuration if env variables are defined	2017-08-02 11:19:25 -04:00
lint.xml
proguard-rules.txt	Reactivate proguard	2017-07-25 18:09:48 -04:00