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 c91d9b7389 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
..
core	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
flavours	Add option to hide action bar in collapsed toots	6 years ago
fonts	…
images	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
packs	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
skins	Port Sylvhem's mastodon-light to glitch flavour	6 years ago
styles	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago