diff options
Diffstat (limited to 'app/javascript/mastodon/reducers/index.js')
| -rw-r--r-- | app/javascript/mastodon/reducers/index.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js index 35f30f601..42b66d15f 100644 --- a/app/javascript/mastodon/reducers/index.js +++ b/app/javascript/mastodon/reducers/index.js @@ -11,6 +11,7 @@ import statuses from './statuses'; import relationships from './relationships'; import settings from './settings'; import local_settings from '../../glitch/reducers/local_settings'; +import push_notifications from './push_notifications'; import status_lists from './status_lists'; import cards from './cards'; import reports from './reports'; @@ -33,7 +34,11 @@ const reducers = { statuses, relationships, settings, +<<<<<<< HEAD local_settings, +======= + push_notifications, +>>>>>>> upstream cards, reports, contexts, |