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 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		6 years ago
..
action_bar.js	…
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	…
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	…