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
..
migrations	Move Models	2015-04-09 00:45:23 -04:00
__init__.py	initial commit	2014-12-04 11:11:46 +00:00
admin.py	More Models	2015-04-06 00:27:59 -04:00
models.py	Move Models	2015-04-09 00:45:23 -04:00
serializers.py	inital rest_framework progress	2015-02-22 17:11:40 +00:00
tests.py	Progress - sprite resource implemented and testing	2015-03-11 20:07:30 +00:00
views.py	Progress - sprite resource implemented and testing	2015-03-11 20:07:30 +00:00