9abb227250
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.
9 lines
179 B
JavaScript
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);
|