Merge branch 'master' of github.com:bartTC/dpaste

This commit is contained in:
Martin Mahner 2014-01-24 13:21:27 +00:00
commit b924e8b79e
2 changed files with 4 additions and 2 deletions

View file

@ -1,12 +1,14 @@
Changelog Changelog
========= =========
2.5 (DEV) 2.5 (2014-01-21)
---------------- ----------------
* IRC lexer is now in the default lexer list. * IRC lexer is now in the default lexer list.
* One-time snippet support. Snippets get automatically deleted after the * One-time snippet support. Snippets get automatically deleted after the
another user looks at it. another user looks at it.
* Toggle wordwrap for code snippets.
* General UI and readability improvements.
2.4 (2014-01-11) 2.4 (2014-01-11)
---------------- ----------------

View file

@ -22,7 +22,7 @@ long_description = u'\n\n'.join((
setup( setup(
name='dpaste', name='dpaste',
version='2.4', version='2.5',
description='dpaste is a Django based pastebin. It\'s intended to run ' description='dpaste is a Django based pastebin. It\'s intended to run '
'separately but its also possible to be installed into an ' 'separately but its also possible to be installed into an '
'existing Django project like a regular app.', 'existing Django project like a regular app.',