OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity
mastodon/app/helpers
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
..
admin Group reports by target account (#8674) 2018-09-13 03:44:08 +02:00
settings
…
application_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
flashes_helper.rb
…
home_helper.rb Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
instance_helper.rb
…
jsonld_helper.rb
…
mailer_helper.rb
…
routing_helper.rb
…
settings_helper.rb Add Czech language option and locale data (#8594) 2018-09-05 08:50:06 +09:00
stream_entries_helper.rb Do not show follow button on moved or memorial accounts (#8546) 2018-08-31 20:33:01 +02:00