You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		6 years ago
..
action_bar.js	Add responsive panels to the single-column layout (#10820)	6 years ago
autosuggest_account.js	…
character_counter.js	…
compose_form.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
emoji_picker_dropdown.js	…
navigation_bar.js	Add responsive panels to the single-column layout (#10820)	6 years ago
poll_button.js	…
poll_form.js	Add emoji suggestions to CW and poll option fields (#10555)	6 years ago
privacy_dropdown.js	…
reply_indicator.js	…
search.js	Add responsive panels to the single-column layout (#10820)	6 years ago
search_results.js	…
text_icon_button.js	…
upload.js	…
upload_button.js	…
upload_form.js	Make the "mark media as sensitive" button more obvious in web UI (#10673)	6 years ago
upload_progress.js	…
warning.js	…