mastodon/app/helpers
Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
2018-09-11 16:51:26 +02:00
..
admin Fix nil error in admin_account_link_to helper (#8578) 2018-09-02 19:10:32 +02:00
settings
application_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:39:16 +02:00
flashes_helper.rb
home_helper.rb
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