about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/reducers/index.js
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-07-01 00:18:49 +0200
committerGitHub <noreply@github.com>2020-07-01 00:18:49 +0200
commit814d3f343f8caae3366410900eec0b90b9bbbb7b (patch)
tree5d0b779a144afd2bff33503804cd5dcc58012ff6 /app/javascript/flavours/glitch/reducers/index.js
parent10ede3eb27c5de5d4e3a283e333af2a54da6177d (diff)
parent3d7ce178dd7be9ef02d34bf6734365d0aefa3120 (diff)
Merge pull request #1366 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 852abe9dd..cadbd01a3 100644
--- a/app/javascript/flavours/glitch/reducers/index.js
+++ b/app/javascript/flavours/glitch/reducers/index.js
@@ -37,6 +37,7 @@ import identity_proofs from './identity_proofs';
 import trends from './trends';
 import announcements from './announcements';
 import markers from './markers';
+import account_notes from './account_notes';
 
 const reducers = {
   announcements,
@@ -77,6 +78,7 @@ const reducers = {
   polls,
   trends,
   markers,
+  account_notes,
 };
 
 export default combineReducers(reducers);