Johannes Mockenhaupt 01d49f9e52 Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: fix storing food to the database remove forgotten log delete all dbrequests from query		2018-01-24 02:15:45 +01:00
..
data	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2018-01-23 02:04:02 +01:00
db	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2018-01-24 02:15:45 +01:00
events	illegalState crash fix	2017-12-31 16:44:13 +01:00
interfaces	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2018-01-21 14:13:46 +01:00
plugins	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2018-01-24 02:15:45 +01:00
queue	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2018-01-24 02:06:02 +01:00
receivers	Merge pull request #505 from jotomo/sync-to-pump	2017-12-20 10:49:47 +01:00
Services	accept local NS data broadcast even when ns_upload_only is selected	2018-01-04 09:45:17 +01:00
tabs	missing file	2017-12-31 16:51:44 +01:00
AgreementActivity.java	age from product flavor to prefs	2017-02-22 20:29:41 +01:00
Config.java	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2018-01-19 21:05:37 +01:00
Constants.java	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-05 00:32:47 +01:00
MainActivity.java	illegalState crash fix	2017-12-31 16:44:13 +01:00
MainApp.java	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2018-01-21 14:13:46 +01:00
PreferencesActivity.java	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2018-01-03 18:28:17 +01:00