mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-24 08:08:07 +01:00
4415005de7
Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict caused because of minor code style change upstream, while glitch-soc has different code for handling variable maximum chars. Ported the change. - `app/serializers/initial_state_serializer.rb`: Conflict because glitch-soc had two extra attributes where upstream added one. Added upstream's attribute. |
||
---|---|---|
.. | ||
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 |