Merge branch 'develop' into feature-payment

2017-03-29 19:15:48 +03:00
parent ea36d4b193 842930b24e
commit 8249819e27
37 changed files with 646 additions and 146 deletions
@@ -2,13 +2,11 @@
 sikweb/settings.py
 *~
 *.pyc
+*.sqlite3
 uwsgi.ini
 uwsgi.log
 infoscreen/static/js/hsl.json
 members/logs/*
-members/migrations/*
-infoscreen/migrations/*
-webapp/migrations/*
 .idea/
 logs/
 /static/