mastodon/app/javascript/flavours/glitch/packs/common.js
Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
2020-03-22 16:10:44 +01:00

9 lines
179 B
JavaScript

import { start } from '@rails/ujs';
start();
import 'flavours/glitch/styles/index.scss';
// This ensures that webpack compiles our images.
require.context('../images', true);