mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-02 05:49:03 +01:00
48373a71e3
# Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/components/status_action_bar.js # app/javascript/flavours/glitch/containers/status_container.js # app/javascript/flavours/glitch/features/status/components/action_bar.js # app/javascript/flavours/glitch/locales/de.json # app/javascript/flavours/glitch/locales/fr.json # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/status/components/action_bar.js # config/locales-glitch/de.yml # config/locales-glitch/fr.yml # config/locales-glitch/simple_form.de.yml # config/locales-glitch/simple_form.fr.yml |
||
---|---|---|
.. | ||
action_bar.js | ||
autosuggest_account.js | ||
character_counter.js | ||
compose_form.js | ||
dropdown.js | ||
dropdown_menu.js | ||
emoji_picker_dropdown.js | ||
header.js | ||
language_dropdown.js | ||
navigation_bar.js | ||
options.js | ||
poll_form.js | ||
privacy_dropdown.js | ||
publisher.js | ||
reply_indicator.js | ||
search.js | ||
search_results.js | ||
text_icon_button.js | ||
textarea_icons.js | ||
upload.js | ||
upload_form.js | ||
upload_progress.js | ||
warning.js |