abettenburg 51399066a4 Merge remote-tracking branch 'upstream/master' into black_whitelist_for_notifications ... # Conflicts: # app/src/main/res/values/strings.xml		2019-01-12 09:55:53 +01:00
..
src/nodomain/freeyourgadget/gadgetbridge/daogen	Merge remote-tracking branch 'upstream/master' into black_whitelist_for_notifications	2019-01-12 09:55:53 +01:00
.gitignore	Work towards using greenDAO #206	2016-03-28 23:18:23 +02:00
build.gradle	db refactoring: depend on latest -fyg patched greendao, change column order again (primary keys first), remove index from pebble health overlay also	2016-08-14 22:33:41 +02:00