Merge pull request #997 from Kentoseth/master

Cleaned up Django version issue + added versions to Flask and Pandas.
This commit is contained in:
victor felder 2014-05-28 23:14:48 +02:00
commit e75f038e1b

View File

@ -116,7 +116,7 @@
* [Prolog](#prolog) * [Prolog](#prolog)
* [Constraint Logic Programming](#constraint-logic-programming-extended-prolog) * [Constraint Logic Programming](#constraint-logic-programming-extended-prolog)
* [Python](#python) * [Python](#python)
* [Django](#django-version) * [Django](#django)
* [Flask](#flask) * [Flask](#flask)
* [Pandas](#pandas) * [Pandas](#pandas)
* [QML](#qml) * [QML](#qml)
@ -1389,7 +1389,7 @@ See also [TeX](#tex)
* [Wikibooks: Python Programming](http://en.wikibooks.org/wiki/Python_Programming) * [Wikibooks: Python Programming](http://en.wikibooks.org/wiki/Python_Programming)
####Django (Version) ####Django
* [Deploy Django](http://www.deploydjango.com) * [Deploy Django](http://www.deploydjango.com)
* [Django by Example](http://www.lightbird.net/dbe/) (1.2) * [Django by Example](http://www.lightbird.net/dbe/) (1.2)
* [Django by Example for Django 1.5](http://lightbird.net/dbe2/) (1.5) * [Django by Example for Django 1.5](http://lightbird.net/dbe2/) (1.5)
@ -1402,11 +1402,11 @@ See also [TeX](#tex)
####Flask ####Flask
* [The Flask Blog tutorial](http://pypix.com/python/building-flask-blog-part-1/) - Pypix * [The Flask Blog tutorial](http://pypix.com/python/building-flask-blog-part-1/) - Pypix
* [The Flask Mega-Tutorial](http://blog.miguelgrinberg.com/post/the-flask-mega-tutorial-part-i-hello-world) - Miguel Grinberg * [The Flask Mega-Tutorial](http://blog.miguelgrinberg.com/post/the-flask-mega-tutorial-part-i-hello-world) - Miguel Grinberg (0.9)
####Pandas ####Pandas
* [Learn Pandas](https://bitbucket.org/hrojas/learn-pandas) - Hernan Rojas * [Learn Pandas](https://bitbucket.org/hrojas/learn-pandas) - Hernan Rojas (0.13.0)
###QML ###QML