Merge branch 'master' into form_views_refactor

This commit is contained in:
Nicholas Staples
2016-01-06 11:46:58 +00:00
4 changed files with 34 additions and 9 deletions

View File

@@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-
import time
from flask import render_template
from app.main import main