eee36267d6
Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change. |
||
|---|---|---|
| .. | ||
| actions | ||
| components | ||
| containers | ||
| features | ||
| images | ||
| locales | ||
| middleware | ||
| packs | ||
| reducers | ||
| selectors | ||
| store | ||
| styles | ||
| utils | ||
| api.js | ||
| base_polyfills.js | ||
| blurhash.js | ||
| compare_id.js | ||
| extra_polyfills.js | ||
| initial_state.js | ||
| is_mobile.js | ||
| load_keyboard_extensions.js | ||
| load_polyfills.js | ||
| main.js | ||
| names.yml | ||
| performance.js | ||
| permissions.js | ||
| ready.js | ||
| scroll.js | ||
| settings.js | ||
| stream.js | ||
| theme.yml | ||
| uuid.js | ||