Matt Westcott 00e12cccaf Merge branch 'master' into feature/fep2 ... Conflicts: docs/index.rst		2014-07-04 22:00:46 +01:00
..
djangodevelopers.rst	update building_your_site and model_recipes docs to cover the new route/serve API	2014-07-04 17:50:26 +01:00
frontenddevelopers.rst	fix documentation syntax errors / warnings	2014-07-04 21:57:58 +01:00
index.rst	Documentation tweaks	2014-05-28 13:22:32 +01:00