Merge remote-tracking branch 'origin/master'

This commit is contained in:
Martin Mahner 2014-03-13 15:42:13 +01:00
commit 68cb1c27ec
2 changed files with 4 additions and 0 deletions

View file

@ -6,6 +6,8 @@ dpaste
:target: https://travis-ci.org/bartTC/dpaste :target: https://travis-ci.org/bartTC/dpaste
.. image:: https://coveralls.io/repos/bartTC/dpaste/badge.png?branch=master .. image:: https://coveralls.io/repos/bartTC/dpaste/badge.png?branch=master
:target: https://coveralls.io/r/bartTC/dpaste?branch=master :target: https://coveralls.io/r/bartTC/dpaste?branch=master
.. image:: https://api.flattr.com/button/flattr-badge-large.png
:target: https://flattr.com/submit/auto?user_id=bartTC&url=https%3A%2F%2Fgithub.com%2FbartTC%2Fdpaste
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.

View file

@ -43,6 +43,8 @@
{% if is_new %} {% if is_new %}
<div class="news"> <div class="news">
<h2>Recent Changes</h2> <h2>Recent Changes</h2>
<p>{{ DPASTE_NEW_EXTRA }}</p>
<p>dpaste now supports one time snippets as an option in the <p>dpaste now supports one time snippets as an option in the
expiration dropdown. One time snippets are deleted as soon as expiration dropdown. One time snippets are deleted as soon as
another person views the snippet.</p> another person views the snippet.</p>