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

This commit is contained in:
Chase Sterling 2016-07-28 10:22:37 -04:00
commit f175f12970
2 changed files with 4 additions and 2 deletions

View file

@ -23,7 +23,7 @@ class Config(object):
BASE_URL = 'http://localhost'
SITE_TITLE = "Realms"
# https://pythonhosted.org/Flask-SQLAlchemy/config.html#connection-uri-format
# http://flask-sqlalchemy.pocoo.org/config/#connection-uri-format
DB_URI = 'sqlite:////tmp/wiki.db'
# DB_URI = 'mysql://scott:tiger@localhost/mydatabase'
# DB_URI = 'postgresql://scott:tiger@localhost/mydatabase'