Merge branch 'develop' into utf8mb4

[friendica.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 73ef005e94a4d246498b19b0b64723dd68b6e703..a3a974eb6210f13cc23f7b67566f561475ef1247 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 3.5.1
+Version 3.5.1 (2017-03-12)
   Friendica Core:
     Updates to the translations (BG, CA, CS, DE, EO, ES, FR, IS, IT, NL, PL, PT-BR, RU, SV) [translation teams]
     Fix for a potential XSS vector [heluecht, thanks to Vít Šesták 'v6ak' for reporting the problem]
@@ -63,7 +63,7 @@ Version 3.5.1
     2850, 2858, 2865, 2892, 2894, 2895, 2907, 2908, 2914, 2015, 2926,
     2948, 2955, 2958, 2963, 2964, 2968, 2987, 2993, 3020, 3052, 3062,
     3066, 3091, 3108, 3113, 3116, 3117, 3118, 3126, 3130, 3135, 3155,
-    3163
+    3160, 3163, 3187, 3196
 
 Version 3.5 (2016-09-13)
   Friendica Core: