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
..
base.txt	Merge branch 'develop' into feature/migrate-city-objects	2019-10-23 09:27:42 +03:00
development.txt	update establishment-list endpoint	2019-08-27 12:33:16 +03:00