Updates Changelog to 0.1.3

2017-06-06 07:15:41 -05:00 · 2017-06-06 07:15:41 -05:00 · 3e83a29587
parent bbe4721c76
commit 3e83a29587
1 changed files with 6 additions and 5 deletions
--- a/11
+++ b/11
@ -5,9 +5,10 @@
 * Huge speedup by caching ldap

 [0.1.2]
-<<<<<<< HEAD
-* Uses syncthing generated config
-* Bumps to version 0.14.28
-=======
 * Fixed wrong URL
->>>>>>> 37b6969e241d42fce63138f87dfb344503708d53
+
+[0.1.3]
+* Uses syncthing generated config
+* Bumps to version 0.14.29
+
+