Alinson Xavier af7c4e227d Fix merge		2017-06-10 19:34:44 -04:00
..
androidTest	Merge tag 'v1.7.5' into dev	2017-06-10 18:59:28 -04:00
main	Fix merge	2017-06-10 19:34:44 -04:00
test/java/org/isoron/uhabits	Fix merge	2017-06-10 19:34:44 -04:00