summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG7
-rw-r--r--VERSION2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 96acfba1440..7a438351e07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+v 1.2.0
+ - new design
+ - user dashboard
+ - markdown support for comments
+ - encoding issues
+ - wall like twitter timeline
+
v 1.1.0
- project dashboard
- wall redesigned
diff --git a/VERSION b/VERSION
index 9084fa2f716..26aaba0e866 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.0
+1.2.0