diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-29 18:27:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-29 18:27:34 +0200 |
| commit | 54ed35f57c55fff639c8192b99fc60ab69c54f06 (patch) | |
| tree | 78cee27bfe871569f3ae2e7aa62d847fe9df7046 /app/javascript/flavours/glitch/packs | |
| parent | 63f79874b59b3ba28c0f940b9d36ea7aacb44c93 (diff) | |
| parent | 485b43ed7e312ab2c3bad446132c57d6a0ce7de4 (diff) | |
Merge pull request #1801 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/packs')
| -rw-r--r-- | app/javascript/flavours/glitch/packs/settings.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/packs/settings.js b/app/javascript/flavours/glitch/packs/settings.js index 0a53e1c25..de88d4f52 100644 --- a/app/javascript/flavours/glitch/packs/settings.js +++ b/app/javascript/flavours/glitch/packs/settings.js @@ -2,6 +2,7 @@ import 'packs/public-path'; import loadPolyfills from 'flavours/glitch/util/load_polyfills'; import ready from 'flavours/glitch/util/ready'; import loadKeyboardExtensions from 'flavours/glitch/util/load_keyboard_extensions'; +import 'cocoon-js-vanilla'; function main() { const { delegate } = require('@rails/ujs'); |