summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-09-14 23:47:51 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-09-14 23:47:51 -0400
commit7cc222d1faa0a4cefb0ef62753507b64e1b7e58a (patch)
tree9b056f1b4dde7b8d5395a146e9d17851e9dca4da
parentf76dd3c8b60ddf4fa16dc19a3f5eb8089dee59c1 (diff)
parentf595baa47e6c465dbf7188701fc9de41aa1ba4e6 (diff)
downloadaskbot-7cc222d1faa0a4cefb0ef62753507b64e1b7e58a.tar.gz
askbot-7cc222d1faa0a4cefb0ef62753507b64e1b7e58a.tar.bz2
askbot-7cc222d1faa0a4cefb0ef62753507b64e1b7e58a.zip
merged with the master branch
-rw-r--r--askbot/doc/source/changelog.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index f90fdc73..88fc90d8 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -15,6 +15,7 @@ Development version
* Editable optional three level category selector for the tags (Evgeny)
* Tag editor adding tags as they are typed (Evgeny)
* Added optional support for unicode slugs (Evgeny)
+* Allow switching comment with answer and answer with question comment (Adolfo)
* Allow user names longer than 30 characters (Evgeny)
* Option to disable feedback form for the anonymos users (Evgeny)
* Optional restriction to have confirmed email address to join forum (Evgeny)