Merge commit 'origin/master' into fusionax

[platal.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index fee06ea..778ee12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
 ================================================================================
+VERSION 0.f.0                                                         XX XX XXXX
+
+New:
+    * Core:
+        - Centralises email management through an email combobox           -JAC
+
+Bug/Wish:
+    * Profile:
+        - #188: Adds informations about the Corps d'État                   -JAC
+        - #209: Thoroughly changes education's implementation              -JAC
+        - #386: Adds the possibility to fill in multiple nationalities     -JAC
+        - #891: Improves education display                                 -JAC
+
+================================================================================
 VERSION 0.10.1                                                        XX XX XXXX
 
 
@@ -1295,7 +1309,9 @@ ACRONYMS:
     * CAT: Florian El Ahdab     (LeChat)    <florian.el-ahdab@m4x.org>
     * FAL: Raphaël Marichez     (Falco)     <raphael.marichez@m4x.org>
     * FRU: Florent Bruneau      (Fruneau)   <florent.bruneau@m4x.org>
+    * GUI: Guillaume Bandet     (GUI)       <guillaume.bandet@m4x.org>
     * JAC: Stéphane Jacob       (jacou)     <stephane.jacob@m4x.org>
+    * JM : Jean-Marc Bécu                   <jean-marc.becu@m4x.org>
     * JS : Jean Sébastien Bedo              <jean-sebastien.bedo@m4x.org>
     * MC : Pierre Habouzit      (MadCoder)  <pierre.habouzit@m4x.org>
     * mYk: Aymeric Augustin     (mYk)       <aymeric.augustin@m4x.org>