Merge tootsuite/master at 3023725936

app/javascript/mastodon/initial_state.js

@@ -1,5 +1,13 @@
 const element = document.getElementById('initial-state');
-const initialState = element && JSON.parse(element.textContent);
+const initialState = element && function () {
+  const result = JSON.parse(element.textContent);
+  try {
+    result.local_settings = JSON.parse(localStorage.getItem('mastodon-settings'));
+  } catch (e) {
+    result.local_settings = {};
+  }
+  return result;
+}();
 
 const getMeta = (prop) => initialState && initialState.meta && initialState.meta[prop];