Johannes Mockenhaupt 8ee95077a8 Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: fix objective 1 upload aps status and iob when loop is suspended fully offline CP Queue: synchronize creating queue thread to avoid multiple threads. Wear: No guard for RS		2017-12-31 11:41:41 +01:00
..
data	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-30 19:59:39 +01:00
db	Merge remote-tracking branch 'origin/dev' into csv2-staging	2017-12-25 20:29:32 +01:00
events	Better log messages for events.	2017-10-26 16:54:46 +02:00
interfaces	Merge remote-tracking branch 'origin/dev' into csv2-staging	2017-12-25 20:29:32 +01:00
plugins	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-31 11:41:41 +01:00
queue	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-31 11:41:41 +01:00
receivers	Merge pull request #505 from jotomo/sync-to-pump	2017-12-20 10:49:47 +01:00
Services	Merge pull request #552 from MilosKozak/nsoffline	2017-12-20 20:17:30 +01:00
tabs	fix crash in instantiating fragment	2017-06-30 09:46:56 +02: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	2017-12-05 00:32:47 +01:00
Constants.java	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-05 00:32:47 +01:00
MainActivity.java	G5 offline/uploader	2017-11-29 16:07:26 +01:00
MainApp.java	Merge remote-tracking branch 'origin/dev' into csv2-staging	2017-12-25 20:29:32 +01:00
PreferencesActivity.java	Remove empty Combo prefs.	2017-12-27 01:33:42 +01:00