X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=ChangeLog;h=8fb93763816f5aa7621ebfee6651be0e349740f6;hb=ca6980dc93884243957e9582f6a25797a746ddbb;hp=37509804a5d8f68808ea2396653e74f397d3b427;hpb=d82359a556779137f8a90d0312b3098a2db6f482;p=platal.git

diff --git a/ChangeLog b/ChangeLog
index 3750980..8fb9376 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 ================================================================================
-VERSION 1.1.0                                                         XX XX XXXX
+VERSION 1.1.1                                                         XX XX XXXX
+
+Bug/Wish:
+
+    * Emails:
+        - #1459: Lists and administrates aliases on main domain            -JAC
+
+From 1.1.0 branch:
+
+    * Search:
+        - #1449: Load json2 on IE because IE<=7 do not implement JSON      -FRU
+
+================================================================================
+VERSION 1.1.0                                                         26 03 2011
 
 New: