Skip to content

Commit 4c31006

Browse files
committed
move badges below PyPi ignore seperator
Conflicts: README.md
1 parent 2044c41 commit 4c31006

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

README.md

+11-14
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,17 @@ Development
183183
The folder **testproject/** contains a pre-configured django project and an sqlite database. Login for django admin is *admin:admin*. This project should always be maintained, but please do not commit changes to the SQLite database as we only care about its contents in case data models are changed.
184184

185185

186+
Acknowledgements
187+
----------------
188+
189+
* The people at [edX](http://www.edxonline.org/) & MIT for finding and supporting the project both financially and with ideas.
190+
* [django-cms](https://github.com/divio/django-cms) for venturing where no django app has gone before in terms of well-planned features and high standards. It's a very big inspiration.
191+
* [django-mptt](https://github.com/django-mptt/django-mptt), a wonderful utility for inexpensively using tree structures in Django with a relational database backend.
192+
* [spookylukey](https://github.com/spookylukey), [jluttine](https://github.com/jluttine), [cXhristian](https://github.com/cXhristian), [valberg](https://github.com/valberg), [jdcaballero](https://github.com/jdcaballero), [yekibud](https://github.com/yekibud), [bridger](https://github.com/bridger), [TomLottermann](https://github.com/TomLottermann), [crazyzubr](https://github.com/crazyzubr), and [everyone else](https://github.com/benjaoming/django-wiki/contributors) involved!
193+
194+
<!---Illegal PyPi RST data -->
195+
<!---Anything that isn't validly translateable to PyPi RST goes after this line -->
196+
186197
Badgers Badgers Badgers
187198
-----------------------
188199

@@ -199,17 +210,3 @@ Badgers Badgers Badgers
199210
[![Dependency Status](https://gemnasium.com/django-wiki/django-wiki.svg)](https://gemnasium.com/django-wiki/django-wiki)
200211

201212
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/django-wiki/django-wiki/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
202-
203-
204-
Acknowledgements
205-
----------------
206-
207-
* The people at [edX](http://www.edxonline.org/) & MIT for finding and supporting the project both financially and with ideas.
208-
* [django-cms](https://github.com/divio/django-cms) for venturing where no django app has gone before in terms of well-planned features and high standards. It's a very big inspiration.
209-
* [django-mptt](https://github.com/django-mptt/django-mptt), a wonderful utility for inexpensively using tree structures in Django with a relational database backend.
210-
* [spookylukey](https://github.com/spookylukey), [jluttine](https://github.com/jluttine), [cXhristian](https://github.com/cXhristian), [valberg](https://github.com/valberg), [jdcaballero](https://github.com/jdcaballero), [yekibud](https://github.com/yekibud), [bridger](https://github.com/bridger), [TomLottermann](https://github.com/TomLottermann), [crazyzubr](https://github.com/crazyzubr), and [everyone else](https://github.com/benjaoming/django-wiki/contributors) involved!
211-
212-
<!---Illegal PyPi RST data -->
213-
<!---Anything that isn't validly translateable to PyPi RST goes after this line -->
214-
215-

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
universal = 1
33

44
[metadata]
5-
description-file = README.md
5+
description-file = README.rst

0 commit comments

Comments
 (0)