6 commits

Author	SHA1	Message	Date
Nico Schmitz	9e03f0f8ca	Update to current dev branch	2018-12-11 14:51:26 +01:00
Milos Kozak	f7269a806d	nsclient allow general preferences	2018-09-11 20:08:59 +02:00
Nico Schmitz	5386c7db4a	Update to upstream/dev and resolve conflicts	2018-08-19 14:37:42 +02:00
Milos Kozak	fff2e84608	remove g5uploader flavor	2018-08-07 21:45:35 +02:00
Milos Kozak	fcf47ecc03	NSClient2 flavor	2018-08-07 21:07:43 +02:00
Milos Kozak	75bb38ba1f	move activities to new package	2018-07-29 00:08:28 +02:00

Renamed from app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java (Browse further)