Andrii Marynets 303d99d70d Merge branch 'master' into feature/add_google_analytics ... # Conflicts: # datacenterlight/templates/datacenterlight/order_detail.html		2017-07-02 17:56:07 +03:00
..
locale/de/LC_MESSAGES
migrations
static/datacenterlight
templates/datacenterlight
templatetags
__init__.py
admin.py
apps.py
forms.py
models.py
tests.py
urls.py
views.py