diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-02-04 23:18:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-04 23:18:14 +0100 |
commit | 76b4e7727b7497c1b68e06133831701f8950ae19 (patch) | |
tree | dee110c9c6afd598b202e73283d5c8f8ae6d3999 /app/javascript/flavours/glitch/reducers/custom_emojis.js | |
parent | ec26f7c1b16ca1429991212292e35e520c617485 (diff) | |
parent | fa433ac5a638b00f5bf77ee52955696d7aa842d6 (diff) |
Merge pull request #2101 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/custom_emojis.js')
-rw-r--r-- | app/javascript/flavours/glitch/reducers/custom_emojis.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/reducers/custom_emojis.js b/app/javascript/flavours/glitch/reducers/custom_emojis.js index f490d0db1..7f71ab791 100644 --- a/app/javascript/flavours/glitch/reducers/custom_emojis.js +++ b/app/javascript/flavours/glitch/reducers/custom_emojis.js @@ -12,4 +12,4 @@ export default function custom_emojis(state = initialState, action) { } return state; -}; +} |