60298af3c4
Conflicts: - `app/views/layouts/application.html.haml`: Upstream changed how the `inert.css` file is included. The conflict is caused by glitch-soc's theming system. Ported the upstream change. Additional changes: - `config/webpack/shared.js`: bypass glitch-soc's theming system for `inert` pack. |
||
|---|---|---|
| .. | ||
| admin.jsx | ||
| application.js | ||
| common.js | ||
| error.js | ||
| inert.js | ||
| public-path.js | ||
| public.jsx | ||
| share.jsx | ||
| sign_up.js | ||