summaryrefslogtreecommitdiffstats
path: root/askbot/doc
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-03-23 18:58:43 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-03-23 18:58:43 -0400
commit6340c2b6f3b8f65b022cfe96582d11c3d3507e54 (patch)
tree07d472883d5bc5618230a04c06e01dd0227d7039 /askbot/doc
parentc78a52d5edb205907b579f2f311ef60de988bfe1 (diff)
parent0b038de3f3994573be7fe453dab3db34fada3454 (diff)
downloadaskbot-6340c2b6f3b8f65b022cfe96582d11c3d3507e54.tar.gz
askbot-6340c2b6f3b8f65b022cfe96582d11c3d3507e54.tar.bz2
askbot-6340c2b6f3b8f65b022cfe96582d11c3d3507e54.zip
merged with the master branch
Diffstat (limited to 'askbot/doc')
-rw-r--r--askbot/doc/source/changelog.rst1
-rw-r--r--askbot/doc/source/contributors.rst1
2 files changed, 2 insertions, 0 deletions
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index d34b1df4..24b72181 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -4,6 +4,7 @@ Changes in Askbot
Development version
-------------------
* Some support for the media compression (Tyler Mandry)
+* Allowed to enable and disable question scopes on the main page
* Added full text support for some languages with Postgresql:
Danish, Dutch, English, Finnish, French, German, Hungarian,
Italian, Japanese (requires package textsearch_ja), Norwegian,
diff --git a/askbot/doc/source/contributors.rst b/askbot/doc/source/contributors.rst
index b964c7dd..3fa086df 100644
--- a/askbot/doc/source/contributors.rst
+++ b/askbot/doc/source/contributors.rst
@@ -44,6 +44,7 @@ Programming, bug fixes and documentation
* `jtrain <https://github.com/jtrain>`_
* Niki Rocco
* `Tyler Mandry <https://github.com/tmandry>`_
+* `Jorge López Pérez <https://github.com/adobo>`_
Translations
------------