Mastodon

History

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

2018-10-01 12:43:20 +02:00

core

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-19 21:46:01 +02:00

flavours

Add option to hide action bar in collapsed toots

2018-09-30 08:31:50 +02:00

fonts

…

images

Merge branch 'master' into glitch-soc/tentative-merge

2018-07-09 07:13:59 +02:00