mirsal/capsul-flask
0
0
Fork 0
forked from 3wordchant/capsul-flask
Code Issues Pull Requests Projects Releases Wiki Activity

Fix botched merge

Browse Source
This commit is contained in:
3wc 2021-07-17 13:31:32 +02:00
parent 82c0c63ff4
commit bef379273f
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
capsulflask/__init__.py
View File

@ -188,17 +188,17 @@ def create_app():
auth, landing, console, payment, metrics, cli, hub_api, publicapi, admin auth, landing, console, payment, metrics, cli, hub_api, publicapi, admin
) )
app.register_blueprint(landing.bp) app.register_blueprint(auth.bp)
app.register_blueprint(auth.bp) app.register_blueprint(landing.bp)
app.register_blueprint(console.bp) app.register_blueprint(console.bp)
app.register_blueprint(payment.bp) app.register_blueprint(payment.bp)
app.register_blueprint(metrics.bp) app.register_blueprint(metrics.bp)
app.register_blueprint(cli.bp) app.register_blueprint(cli.bp)
app.register_blueprint(hub_api.bp) app.register_blueprint(hub_api.bp)
app.register_blueprint(admin.bp) app.register_blueprint(admin.bp)
app.register_blueprint(publicapi.bp) app.register_blueprint(publicapi.bp)
app.add_url_rule("/", endpoint="index") app.add_url_rule("/", endpoint="index")
if app.config['SPOKE_MODE_ENABLED']: if app.config['SPOKE_MODE_ENABLED']:
if app.config['SPOKE_MODEL'] == "shell-scripts": if app.config['SPOKE_MODEL'] == "shell-scripts":
@ -254,4 +254,3 @@ def create_app():
return url_for(endpoint, **values) return url_for(endpoint, **values)
return app return app
>>>>>>> tests