Commit Graph

5 Commits

Author SHA1 Message Date
Anatoly
90e53d738d Merge branch 'develop' into feature/gm-148
# Conflicts:
#	apps/main/models.py
#	apps/news/admin.py
#	apps/news/models.py
#	apps/news/serializers.py
#	apps/news/views.py
#	project/settings/base.py
#	project/settings/production.py
#	requirements/base.txt
2019-10-23 12:00:58 +03:00
Kuroshini
0408d93599 Squashed migrations && added lastable credentials 2019-10-03 13:41:45 +03:00
Anatoly
d9635a8599 gm-148: refactored 2019-10-02 10:16:32 +03:00
Kuroshini
4c960c8abf Booking (squashed commit) 2019-10-01 18:25:57 +03:00
Dmitriy Kuzmenko
fc2a689b6d version 0.0.1: add project, model user and api 2019-08-07 16:10:23 +03:00