cloudron/syncthing-app
1
0
Fork 0
mirror of https://git.cloudron.io/cloudron/syncthing-app synced 2025-03-15 01:52:46 +00:00
Code Issues Releases Wiki Activity

Merges master with pull request branch

Browse Source
This commit is contained in:
Shane Perry 2017-06-06 07:11:52 -05:00
commit bbe4721c76
2 changed files with 8 additions and 0 deletions

4
CHANGELOG

@ -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

4
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": [