Johannes Mockenhaupt 57944fb4b5 Merge remote-tracking branch 'origin/dev' into smb060 ... * origin/dev: Actions tab: show profile switch button for single profile too. Old NS-Version non-urgent Add SP to imports refactor cancelAlarm back to KeepAliveReceiver push next alert on read status G5 upload to xdrip fake Esel new file fake Esel Apply bolus constraint before applying. Rv2,RS: always load last 45 min remove wear-overview notifications as replaced by system notifications Remove missed reference to pref in NSProfilePlugin. Remove 'sync to profile' pref. # Conflicts: # app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java		2017-12-20 17:28:08 +01:00
..
androidaps	Merge remote-tracking branch 'origin/dev' into smb060	2017-12-20 17:28:08 +01:00
utils	Merge remote-tracking branch 'origin/dev' into smb060	2017-12-20 17:28:08 +01:00