about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/reducers/index.js
diff options
context:
space:
mode:
authorStarfall <admin@plural.cafe>2020-05-31 12:56:29 -0500
committerStarfall <admin@plural.cafe>2020-05-31 12:56:29 -0500
commit76f79dd29909d39f1d36ef48e6892223d59e29d7 (patch)
tree8a5ace5fea5cf8a4c6f1c55e01db99a289c4b1e3 /app/javascript/flavours/glitch/reducers/index.js
parent0167552bed46508efeed266853a1ee4437e12998 (diff)
parentddcd9fe9f0e85b1db12ae584749e680146611f9a (diff)
Merge branch 'glitch'
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/index.js')
-rw-r--r--app/javascript/flavours/glitch/reducers/index.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/reducers/index.js b/app/javascript/flavours/glitch/reducers/index.js
index 586b84749..852abe9dd 100644
--- a/app/javascript/flavours/glitch/reducers/index.js
+++ b/app/javascript/flavours/glitch/reducers/index.js
@@ -36,6 +36,7 @@ import polls from './polls';
 import identity_proofs from './identity_proofs';
 import trends from './trends';
 import announcements from './announcements';
+import markers from './markers';
 
 const reducers = {
   announcements,
@@ -75,6 +76,7 @@ const reducers = {
   pinnedAccountsEditor,
   polls,
   trends,
+  markers,
 };
 
 export default combineReducers(reducers);