Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop

This commit is contained in:
Daniel Greenfeld 2013-06-04 19:04:05 +02:00
commit 4fb43db3e8

View file

@ -3,7 +3,7 @@ CONTRIBUTORS
Project Lead
===============
* Daniel Greenfeld <pydanny@gmail.com>
* Daniel Greenfeld (@pydanny / <pydanny@gmail.com>)
Developers
=============
@ -20,3 +20,4 @@ Developers
* Allison Kapture (@akapture)
* Roman Gladkov (@d1ffuz0r / d1fffuz0r@gmail.com)
* Pau Rosello Van Schoor (@paurosello)
* Wade Austin (@waustin)