Anatoly 90e53d738d Merge branch 'develop' into feature/gm-148 ... # Conflicts: # apps/main/models.py # apps/news/admin.py # apps/news/models.py # apps/news/serializers.py # apps/news/views.py # project/settings/base.py # project/settings/production.py # requirements/base.txt		2019-10-23 12:00:58 +03:00
..
migrations	change title field in model Collection to translated JSON field (gm-165)	2019-10-23 11:25:04 +03:00
urls	Feature/mobile features	2019-10-17 13:29:29 +00:00
views	Feature/mobile features	2019-10-17 13:29:29 +00:00
__init__.py	version 0.0.6 new models and api for News	2019-08-13 15:23:00 +03:00
admin.py	gm-192: in progress	2019-10-08 15:38:35 +03:00
apps.py	SiteSettings: model, migration, view, serializer	2019-08-19 16:55:16 +03:00
methods.py	Added method for getting coordinates and city by ip	2019-10-17 07:03:48 +00:00
models.py	Merge branch 'develop' into feature/gm-148	2019-10-23 12:00:58 +03:00
serializers.py	added imgae_url field to model Award (gm-183)	2019-10-22 18:20:34 +03:00
tests.py	version 0.0.6 new models and api for News	2019-08-13 15:23:00 +03:00