Merge with master

This commit is contained in:
ibuler
2016-10-02 21:45:26 +08:00
20 changed files with 804 additions and 203 deletions

View File

@@ -3,7 +3,6 @@
from __future__ import unicode_literals
import logging
import os
import re
from django.conf import settings
from django.contrib.auth.mixins import UserPassesTestMixin