3f8f1b01c0
Conflicts: - app/services/remove_status_service.rb Conflict because we still handle the direct timeline. Took upstream changes, with that one extra function call. - config/locales/ca.yml Conflict because theme names were updated. Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/oc.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/pl.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts. |
||
---|---|---|
.. | ||
action_bar.js | ||
autosuggest_account.js | ||
character_counter.js | ||
compose_form.js | ||
emoji_picker_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 |