106 commits

Author	SHA1	Message	Date
phalt	456c77f55e	Merge branch 'master' of github.com:phalt/pokeapi	2014-12-15 10:01:58 +00:00
phalt	8a880fe60d	changed pokemon_v1 to pokemon backwards compat	2014-12-15 10:01:53 +00:00
Opalo	d52c10875e	Update settings.py ... Added 'xml' to 'TASTYPIE_DEFAULT_FORMATS' as in http://django-tastypie.readthedocs.org/en/latest/settings.html	2014-12-10 20:45:10 +01:00
Alex Petersen	ec50da1dcb	updated as per pull request#19	2014-12-07 11:32:09 -05:00
Alex Petersen	3337817bf9	added CORS middleware with basic installation / tests for v1 & v2 apis	2014-12-06 17:57:42 -05:00
phalt	21a1d4bf46	initial commit	2014-12-04 11:11:46 +00:00