Backport

[platal.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index dab3f04..424f4e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,11 +17,17 @@ Bug/Wish:
         - #473: Use 'événement' instead of 'évènement'.                    -FRU
         - #475: More understandable bug report form.                       -FRU
 
+    * Profile:
+        - #502: Use 'alias' instead of 'aka' to specify the nickname       -FRU
+
 From 0.9.11 branch:
 
     * Core:
         - #472: Fix problem with auth when using the cookie.                -MC
 
+    * Emails:
+        - #496: Fix link to warn user who has a broken email               -FRU
+
     * Geoloc:
         - #469: Google Maps link works for the USA.                        -FRU
 
@@ -30,6 +36,7 @@ From 0.9.11 branch:
 
     * Profile:
         - #486: fix force login to see private fiche.                      -Car
+        - #509: can access trombi of the current year promotion            -FRU
 
 ================================================================================
 VERSION 0.9.11                                                 18 Septembre 2006