Merge branch 'master' of github.com:sehmaschine/django-grappelli

Conflicts: LICENSE MANIFEST.in setup.py
mijamo · Jul 19, 2011 · 295c377 · 295c377
2 parents acf015e + 2bfc576
commit 295c377
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 80 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1,2 @@
+Patrick Kranzlmueller <[email protected]>
+Axel Swoboda <[email protected]>
diff --git a/LICENSE b/LICENSE
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/README.rst b/README.rst
@@ -0,0 +1,21 @@
+Django Grappelli
+================
+
+**A jazzy skin for the Django admin interface**.
+
+Grappelli is a grid-based alternative/extension to the `Django <http://www.djangoproject.com>`_ administration interface.
+
+Code
+----
+
+https://github.com/sehmaschine/django-grappelli
+
+Documentation
+-------------
+
+http://readthedocs.org/docs/django-grappelli/
+
+Releases
+--------
+
+The latest release is Grappelli 2.3.3, which requires Django 1.3
diff --git a/setup.py b/setup.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Patrick Kranzlmueller <[email protected]>
		Axel Swoboda <[email protected]>