Anatoly 26ff9963d8 Merge branch 'develop' into feature/gm-148 ... # Conflicts: # requirements/base.txt		2019-10-17 13:43:24 +03:00
..
migrations	merge migrations	2019-09-19 12:55:58 +03: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	gm-192: in progress	2019-10-08 15:38:35 +03:00
serializers.py	Review fixes	2019-09-30 16:40:46 +03:00
tests.py	version 0.0.6 new models and api for News	2019-08-13 15:23:00 +03:00
urls.py	Added method for getting coordinates and city by ip	2019-10-17 07:03:48 +00:00
views.py	Added method for getting coordinates and city by ip	2019-10-17 07:03:48 +00:00