Merge remote-tracking branch 'origin/master'

This commit is contained in:
Martin Mahner 2013-12-18 12:54:32 +01:00
commit d6adff489c

View file

@ -2,6 +2,11 @@
dpaste dpaste
====== ======
.. image:: https://travis-ci.org/bartTC/dpaste.png?branch=master
:target: https://travis-ci.org/bartTC/dpaste
.. image:: https://coveralls.io/repos/bartTC/dpaste/badge.png?branch=master
:target: https://coveralls.io/r/bartTC/dpaste?branch=master
dpaste is a Django based pastebin. It's intended to run separately but its also dpaste is a Django based pastebin. It's intended to run separately but its also
possible to be installed into an existing Django project like a regular app. possible to be installed into an existing Django project like a regular app.