diff options
| author | Dejan Noveski <dr.mote@gmail.com> | 2011-11-16 00:50:35 +0100 |
|---|---|---|
| committer | Dejan Noveski <dr.mote@gmail.com> | 2011-11-16 00:50:35 +0100 |
| commit | 50303df91d4c5ad89ad35d8b60845a25b540c0ae (patch) | |
| tree | 45a851975554a4107aaeae29fedd4058e8b86367 | |
| parent | 2052e564b94839b75c49e2e36be0779c21285643 (diff) | |
| parent | 531a5c1e7ce3ccf42f31318adb02e85fd2e88dfa (diff) | |
| download | askbot-50303df91d4c5ad89ad35d8b60845a25b540c0ae.tar.gz askbot-50303df91d4c5ad89ad35d8b60845a25b540c0ae.tar.bz2 askbot-50303df91d4c5ad89ad35d8b60845a25b540c0ae.zip | |
Merge branch 'master' of https://github.com/ASKBOT/askbot-devel
| -rwxr-xr-x | .gitignore | 1 | ||||
| -rw-r--r-- | askbot/doc/source/changelog.rst | 1 | ||||
| -rw-r--r-- | askbot/doc/source/contributors.rst | 1 |
3 files changed, 3 insertions, 0 deletions
@@ -26,6 +26,7 @@ tmp/* load askbot/skins/default/media/js/flot askbot/skins/common/media/js/closure/google-closure +askbot/skins/common/media/js/jquery.fancybox-1.3.4 askbot/fixtures *.egg dist diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst index df4454b1..827afb95 100644 --- a/askbot/doc/source/changelog.rst +++ b/askbot/doc/source/changelog.rst @@ -3,6 +3,7 @@ Changes in Askbot Development version (not yet published) --------------------------------------- +* Context-sensitive RSS url (`Dejan Noveski <http://www.atomidata.com/>`_) * Implemented new version of skin (Byron Corrales) * Show unused vote count (Tomasz Zielinski) * Categorized live settings (Evgeny) diff --git a/askbot/doc/source/contributors.rst b/askbot/doc/source/contributors.rst index 651f547f..e7450293 100644 --- a/askbot/doc/source/contributors.rst +++ b/askbot/doc/source/contributors.rst @@ -19,6 +19,7 @@ Programming and documentation * `Hrishi <https://github.com/stultus>`_ * Andrei Mamoutkine * `Daniel Mican <http://www.crunchbase.com/person/daniel-mican>`_ +* `Dejan Noveski <http://www.atomidata.com/>`_ * `Ramiro Morales <http://rmorales.com.ar/>`_ (with Machinalis) * Vladimir Bokov * `NoahY <https://github.com/NoahY>`_ |