Merge branch 'develop' of sika:vtmk/web2.0 into develop

This commit is contained in:
HooVee
2016-08-25 21:37:19 +03:00
+2
View File
@@ -2,3 +2,5 @@
sikweb/settings.py
*~
*.pyc
uwsgi.ini
uwsgi.log