X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Changelog;h=77aa636bd2f6f7cb202400ed266544f4ba0989df;hb=895712accc11cf9defc13cdbc64a6b3c7e7e548a;hp=2d1476cd6dd5212371125d46d47cb2ba4fd9f6e9;hpb=fa19f2c8adfd85064102b35b1169f3a4086f23b1;p=gosa.git

diff --git a/Changelog b/Changelog
index 2d1476cd6..77aa636bd 100644
--- a/Changelog
+++ b/Changelog
@@ -1,7 +1,11 @@
 GOsa2 changelog
 ===============
 
-* gosa 2.5beta1
+* gosa 2.6
+  - New "OK", "Apply", "Cancel" schema for tabbed dialogs
+  - New ACL implementation
+
+* gosa 2.5
   - Improved FAI support
     * Server and workstations are treated the same way
     * Destination selector for new devices