phalt ba049cc936 Merge branch 'master' into rest-framework ... Conflicts: config/settings.py pokemon_v2/admin.py pokemon_v2/models.py		2015-04-11 11:05:59 +01:00
..
__init__.py	initial commit	2014-12-04 11:11:46 +00:00
local.py	initial commit	2014-12-04 11:11:46 +00:00
settings.py	Squashed migrations and cleaned up config/settings	2015-04-08 09:57:29 -04:00
urls.py	Progress - sprite resource implemented and testing	2015-03-11 20:07:30 +00:00
views.py	remove xml for now	2014-12-15 10:13:52 +00:00
wsgi.py	live server update	2015-02-22 17:26:45 +00:00