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 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		6 years ago
..
action_bar.js	Upgrade Babel to version 7.0.0 (#5925)	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	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
navigation_bar.js	…
privacy_dropdown.js	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
reply_indicator.js	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
search.js	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
search_results.js	…
text_icon_button.js	…
upload.js	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
upload_button.js	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
upload_form.js	…
upload_progress.js	…
warning.js	…