%!s(int64=8) %!d(string=hai) anos · 3e83a29587
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
			
 
				+
			
 
				+