Merge branch 'master' into perm_update

apache · Apr 28, 2017 · aaacbc4 · aaacbc4
2 parents b4c5949 + 58309f2
commit aaacbc4
Show file tree

Hide file tree

Showing 8 changed files with 4,172 additions and 5,436 deletions.
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ Superset provides:
 * An extensible, high granularity security model allowing intricate rules
     on who can access which features, and integration with major
     authentication providers (database, OpenID, LDAP, OAuth & REMOTE_USER
-    through Flask AppBuiler)
+    through Flask AppBuilder)
 * A simple semantic layer, allowing to control how data sources are
     displayed in the UI, by defining which fields should show up in
     which dropdown and which aggregation and function (metrics) are