diff options
| author | ThibG <thib@sitedethib.com> | 2020-03-22 17:59:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 17:59:47 +0100 |
| commit | d101438b9d1bd827c191605cb21d58f83de2124d (patch) | |
| tree | b36d73f45175add7aa114bb42fca5a528a9b24a4 /app/javascript/flavours/glitch/packs/public.js | |
| parent | 7115b0b8c99b7e88aee264be75945e592dec33e4 (diff) | |
| parent | 9da4bd098cac88c3e44157765adcff01445ba31a (diff) | |
Merge pull request #1305 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/packs/public.js')
| -rw-r--r-- | app/javascript/flavours/glitch/packs/public.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/packs/public.js b/app/javascript/flavours/glitch/packs/public.js index d8a97704f..066479fa6 100644 --- a/app/javascript/flavours/glitch/packs/public.js +++ b/app/javascript/flavours/glitch/packs/public.js @@ -5,7 +5,7 @@ import loadKeyboardExtensions from 'flavours/glitch/util/load_keyboard_extension function main() { const IntlMessageFormat = require('intl-messageformat').default; const { timeAgoString } = require('flavours/glitch/components/relative_timestamp'); - const { delegate } = require('rails-ujs'); + const { delegate } = require('@rails/ujs'); const emojify = require('flavours/glitch/util/emoji').default; const { getLocale } = require('locales'); const { messages } = getLocale(); |