OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity
mastodon/app
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
..
chewy
…
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
mailers
…
models Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
policies
…
presenters
…
serializers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
services
…
validators
…
views Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
workers
…