Anatoly 0f6147c1dc Merge remote-tracking branch 'origin/develop' into develop ... # Conflicts: # apps/collection/urls/common.py		2019-08-28 11:50:15 +03:00
..
migrations	refactored gallery app	2019-08-27 18:58:40 +03:00
serializers	fixed serializers	2019-08-28 09:55:45 +03:00
urls	URL refactoring	2019-08-28 11:35:38 +03:00
views	Revert "added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections"	2019-08-27 18:18:58 +03:00
__init__.py	added app collection, added new models	2019-08-21 09:58:45 +03:00
admin.py	added CRUD endpoints for collection app	2019-08-21 12:09:21 +03:00
apps.py	added app collection, added new models	2019-08-21 09:58:45 +03:00
models.py	refactored gallery app	2019-08-27 18:58:40 +03:00
tests.py	added app collection, added new models	2019-08-21 09:58:45 +03:00