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 f5eaefc485 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		6 years ago
..
account/components	Revert Font Awesome 5 upgrade (#8810)	6 years ago
account_gallery	Add a new preference to always hide all media (#8569)	6 years ago
account_timeline	Revert Font Awesome 5 upgrade (#8810)	6 years ago
blocks	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
community_timeline	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
compose	Revert Font Awesome 5 upgrade (#8810)	6 years ago
direct_timeline	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
domain_blocks	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
emoji	Skip VS15 (Emoji textual presentation). (#8553)	6 years ago
favourited_statuses	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
favourites	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
follow_requests	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
followers	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
following	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
generic_not_found	Replace sprockets/browserify with Webpack (#2617)	8 years ago
getting_started	Revert Font Awesome 5 upgrade (#8810)	6 years ago
hashtag_timeline	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
home_timeline	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
keyboard_shortcuts	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
list_editor	Revert Font Awesome 5 upgrade (#8810)	6 years ago
list_timeline	Revert Font Awesome 5 upgrade (#8810)	6 years ago
lists	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
mutes	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
notifications	Revert Font Awesome 5 upgrade (#8810)	6 years ago
pinned_statuses	Revert Font Awesome 5 upgrade (#8810)	6 years ago
public_timeline	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
reblogs	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
report	Add missing video descriptions (#8416)	6 years ago
standalone	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
status	Revert Font Awesome 5 upgrade (#8810)	6 years ago
ui	Revert Font Awesome 5 upgrade (#8810)	6 years ago
video	Revert Font Awesome 5 upgrade (#8810)	6 years ago