Merge branch 'master' into bootstrap4

examples/sqla/admin/main.py

 from admin import app, db
 from admin.models import AVAILABLE_USER_TYPES, User, Post, Tag, Tree
-from flask import Markup
+from flask import Markup, send_file
 
 from wtforms import validators
 
@@ -31,6 +31,11 @@ def index():
     return tmp
 
 
+@app.route('/favicon.ico')
+def favicon():
+    return send_file('static/favicon.ico')
+
+
 # Custom filter class
 class FilterLastNameBrown(BaseSQLAFilter):
     def apply(self, query, value, alias=None):

examples/sqla/requirements.txt

@@ -7,3 +7,7 @@ enum34; python_version < '3.0'
 sqlalchemy_utils
 arrow
 colour
+
+# note: for local development, replace 'Flask-Admin' above with a reference to
+# your local copy of the repo e.g. '-e .' if you're installing this from the
+# repo's root directory