alex 0adac058c5 Merge remote-tracking branch 'origin/feature/develop_ci' into feature/migrate-news ... # Conflicts: # apps/gallery/models.py # requirements/base.txt		2019-10-24 13:11:05 +03:00
..
base.txt	Merge remote-tracking branch 'origin/feature/develop_ci' into feature/migrate-news	2019-10-24 13:11:05 +03:00
development.txt	update establishment-list endpoint	2019-08-27 12:33:16 +03:00