Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of https://github.com/ASKBOT/askbot-devel

  • Loading branch information...
commit 50303df91d4c5ad89ad35d8b60845a25b540c0ae 2 parents 2052e56 + 531a5c1
@dekomote dekomote authored
View
1  .gitignore
@@ -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
View
1  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)
View
1  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>`_
Please sign in to comment.
Something went wrong with that request. Please try again.