littlewolf 7e757aa63f Merge branch 'origin/feature/migration' into migrate-location-app ... # Conflicts: # apps/gallery/models.py # apps/location/transfer_data.py # apps/transfer/management/commands/transfer.py # project/settings/base.py # requirements/base.txt		2019-10-26 08:45:12 +03:00
..
__init__.py	Switch application	2019-10-02 11:41:14 +03:00
transfer.py	Merge branch 'origin/feature/migration' into migrate-location-app	2019-10-26 08:45:12 +03:00