Merge branch 'master' of github.com:ZeusWPI/James

This commit is contained in:
James 2015-04-02 13:00:03 +02:00
commit f12c7b4849

View file

@ -1,6 +1,6 @@
from views import * from views import *
from app import app, db, logger from app import app, db
from admin import admin from admin import admin
from login import login_manager from login import login_manager