summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-06-16 03:29:26 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-06-16 03:29:26 -0400
commitfe453b6e8042e5c6f70777ee1876dd6e9f0f0de0 (patch)
treedd897ee5d3976f125516448cf3d851364f5fe96f
parent073bedd716fca9c4d08175ec1cc6947c87ad0636 (diff)
parent7cf9c1a21a219f0d7b8a15e3203b6d055512cb25 (diff)
downloadaskbot-fe453b6e8042e5c6f70777ee1876dd6e9f0f0de0.tar.gz
askbot-fe453b6e8042e5c6f70777ee1876dd6e9f0f0de0.tar.bz2
askbot-fe453b6e8042e5c6f70777ee1876dd6e9f0f0de0.zip
Merge branch 'github-master'
-rw-r--r--askbot/doc/source/changelog.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index b3954fb1..430d98de 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -4,7 +4,7 @@ Changes in Askbot
Development version
-------------------
* Welcome email for the case when replying by email is enabled (Evgeny)
-* Detection of email signature based on the response to the welome email (Evgeny)
+* Detection of email signature based on the response to the welcome email (Evgeny)
* Hide "website" and "about" section of the blocked user profiles
to help prevent user profile spam (Evgeny)
* Added a function to create a custom user profile tab,