mirror of
https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git
synced 2026-01-11 13:33:21 -08:00
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. |
||
|---|---|---|
| .. | ||
| action_bar.js | ||
| autosuggest_account.js | ||
| character_counter.js | ||
| compose_form.js | ||
| emoji_picker_dropdown.js | ||
| language_dropdown.js | ||
| navigation_bar.js | ||
| poll_button.js | ||
| poll_form.js | ||
| privacy_dropdown.js | ||
| reply_indicator.js | ||
| search.js | ||
| search_results.js | ||
| text_icon_button.js | ||
| upload.js | ||
| upload_button.js | ||
| upload_form.js | ||
| upload_progress.js | ||
| warning.js | ||