Alinson Xavier 2db4c06fe8 Merge branch 'master' into dev ... # Conflicts: # app/src/androidTest/java/org/isoron/uhabits/espresso/MainTest.java # app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java # app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java # app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java # app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java # app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java # app/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java # uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java # uhabits-android/src/main/res/values-id/strings.xml # uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java		2017-07-18 22:54:52 -04:00
..
src	Merge branch 'master' into dev	2017-07-18 22:54:52 -04:00
build.gradle	Socket.io depreciated function	2017-07-14 10:20:51 -05:00
lint.xml	Rename android module to uhabits-android	2017-05-25 08:00:00 -04:00
proguard-rules.txt	Rename android module to uhabits-android	2017-05-25 08:00:00 -04:00