Merge branch 'develop' of github.com:mbi/django-rosetta into develop

Conflicts:
	README.rst
This commit is contained in:
Marco Bonetti 2014-02-13 11:25:55 +01:00
commit 7496bcc082

View file

@ -136,9 +136,6 @@ Acknowledgments
* Rosetta uses the excellent `polib <https://bitbucket.org/izi/polib>`_ library to parse and handle gettext files.
.. image:: https://d2weczhvl823v0.cloudfront.net/mbi/django-rosetta/trend.png
:alt: Bitdeli badge
:target: https://bitdeli.com/free