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 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.		5 years ago
..
action_bar.js	Add confirmation modal when logging out from the web app (#11671)	5 years ago
autosuggest_account.js	…
character_counter.js	…
compose_form.js	…
emoji_picker_dropdown.js	…
navigation_bar.js	Add confirmation modal when logging out from the web app (#11671)	5 years ago
poll_button.js	…
poll_form.js	…
privacy_dropdown.js	Improve keyboard navigation in privacy dropdown (#11492)	5 years ago
reply_indicator.js	…
search.js	…
search_results.js	…
text_icon_button.js	Change icon button styles to make hover/focus states more obvious (#11474)	5 years ago
upload.js	Add media editing modal (#11563)	5 years ago
upload_button.js	…
upload_form.js	Add OCR tool to media editing modal (#11566)	5 years ago
upload_progress.js	Add OCR tool to media editing modal (#11566)	5 years ago
warning.js	…