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.

Alinson S. 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		8 years ago
..
src	Merge branch 'dev' of git://github.com/TruffelNL/uhabits into dev	8 years ago
build.gradle	Only use signing configuration if env variables are defined	8 years ago
lint.xml	Rename android module to uhabits-android	8 years ago
proguard-rules.txt	Reactivate proguard	8 years ago