Johannes Mockenhaupt 8cdd604b84 Merge remote-tracking branch 'origin/dev' into combo ... * origin/dev: bulgarian removed non-translatable synchronize interval access nsclient remove debug data that puts stress on the broadcast system 3 nsclient remove debug data that puts stress on the broadcast system 2 nsclient remove debug data that puts stress on the broadcast system Align OpenAS(A)MA fragments with layout of other fragments. local broadcasts better setting title setting to disable local broadcasts in NSClient removed some "unneeded" translations wear tdd weighted wear TDD status wear menu simplification Translated latest additions strings.xml ns client quickfix now catch all NS client quickfix - catch even more catch TransactionTooLargeException TT new "old" logic for temp targets TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals # Conflicts: # app/src/main/res/values/strings.xml		2017-07-19 19:54:50 +02:00
..
androidaps	Merge remote-tracking branch 'origin/dev' into combo	2017-07-19 19:54:50 +02:00
utils	Bolus wizard: use PumpDescription to round final bolus to a value compatible with the pump.	2017-07-14 23:52:16 +02:00