vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into waltermitty

Browse source 
Conflicts:
	app.py
	data/userfiles.py
This commit is contained in:
Jake Moshenko 2014-09-11 11:18:28 -04:00
commit 2455c17f96
23 changed files with 232 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app.py
View file

@ -89,8 +89,8 @@ Principal(app, use_sessions=False)
login_manager = LoginManager(app)
mail = Mail(app)
storage = Storage(app)
userfiles = Userfiles(app)
log_archive = LogArchive(app)
userfiles = Userfiles(app, storage)
log_archive = LogArchive(app, storage)
analytics = Analytics(app)
billing = Billing(app)
sentry = Sentry(app)