Merge remote-tracking branch 'origin/master' into toml/keycloak_hints

Updated sample config file
Missed committing this
2020-10-15 11:54:08 +01:00 · 2020-09-21 08:38:32 +01:00 · 2020-09-21 08:32:51 +01:00 · 2020-09-21 08:08:30 +01:00
3 changed files with 4 additions and 4 deletions
--- a/.modernizr.json
+++ b/.modernizr.json
@ -6,7 +6,6 @@
  ],
  "feature-detects": [
    "test/css/animations",
-    "test/css/displaytable",
    "test/css/filters",
    "test/css/flexbox",
    "test/css/objectfit",
--- a/config.sample.json
+++ b/config.sample.json
@ -8,6 +8,7 @@
            "base_url": "https://vector.im"
        }
    },
+    "kdp_hint": "KDPHINT",
    "disable_custom_urls": false,
    "disable_guests": false,
    "disable_login_language_selector": false,
--- a/src/vector/modernizr.js
+++ b/src/vector/modernizr.js
Author	SHA1	Message	Date
Tom	be1e99b435	Merge remote-tracking branch 'origin/master' into toml/keycloak_hints	2020-10-15 11:54:08 +01:00
Tom	dbd3f17c21	Updated sample config file	2020-09-21 08:38:32 +01:00
Tom	e3027017f6	Missed committing this	2020-09-21 08:32:51 +01:00
Tom	6729f860b0	Remove displaytable test that we think is triggering erroneously	2020-09-21 08:08:30 +01:00