Merge remote-tracking branch 'origin/master'

emoncms · May 18, 2016 · e805fc9 · e805fc9
2 parents 3a4b759 + 5299720
commit e805fc9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
@@ -24,7 +24,7 @@
         <CheckBoxPreference
             android:key="emoncms_usessl"
             android:title="Use SSL"
-            android:summary="Connect using https, supported by emoncms.org"
+            android:summary="Connect using https, supported by emoncms.org NOT emonPi"
             android:defaultValue="true"/>
 
     </PreferenceCategory>
@@ -39,4 +39,4 @@
 
     </PreferenceCategory>
 
-</PreferenceScreen>
+</PreferenceScreen>