Merges master with pull request branch

2017-06-06 07:11:52 -05:00 · 2017-06-06 07:11:52 -05:00 · bbe4721c76
parent 92ae28d0da 37b6969e24
commit bbe4721c76
2 changed files with 8 additions and 0 deletions
--- a/4
+++ b/4
@ -5,5 +5,9 @@
 * Huge speedup by caching ldap

 [0.1.2]
+<<<<<<< HEAD
 * Uses syncthing generated config
 * Bumps to version 0.14.28
+=======
+* Fixed wrong URL
+>>>>>>> 37b6969e241d42fce63138f87dfb344503708d53
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@ -21,7 +21,11 @@
    }
  },
  "manifestVersion": 1,
+<<<<<<< HEAD
  "website": "https://syncthing.net",
+=======
+  "website": "http://syncthing.net",
+>>>>>>> 37b6969e241d42fce63138f87dfb344503708d53
  "contactEmail": "support@cloudron.io",
  "icon": "logo.png",
  "tags": [