littlewolf f09bd5996a Merge branch 'develop' into feature/migrate-city-objects ... # Conflicts: # project/settings/base.py # requirements/base.txt		2019-10-23 09:27:42 +03:00
..
migrations	Merge branch 'develop' into feature/migrate-city-objects	2019-10-23 09:27:42 +03:00
urls	clean models (tags)	2019-10-15 18:25:09 +03:00
views	slugs for news & establishments	2019-09-24 10:38:04 +03:00
__init__.py	version 0.0.6 new models and api for News	2019-08-13 15:23:00 +03:00
admin.py	clean models (tags)	2019-10-15 18:25:09 +03:00
apps.py	version 0.0.6 new models and api for News	2019-08-13 15:23:00 +03:00
filters.py	establishment list view - added filter by country code	2019-09-02 09:56:55 +03:00
models.py	Merge branch 'develop' into feature/migrate-city-objects	2019-10-23 09:27:42 +03:00
serializers.py	Merge branch 'feature/GM-176_standard_user' into 'develop'	2019-10-21 14:50:47 +00:00
tasks.py	Update tasks.py	2019-10-09 09:46:23 +00:00
tests.py	Fix news tests	2019-10-21 16:21:14 +03:00
transfer_data.py	Remove comments	2019-10-23 09:16:39 +03:00
transfer.py	Add fields map for simple field	2019-10-15 12:05:49 +03:00
views.py	Fix conflict	2019-10-21 14:43:14 +03:00