mastodon/app/helpers
Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.
2018-09-03 14:33:06 +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 Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00
instance_helper.rb
jsonld_helper.rb Improve federated ID validation (#8372) 2018-08-22 20:55:14 +02:00
mailer_helper.rb
routing_helper.rb
settings_helper.rb Enable ro and ta locales in Rails (#8583) 2018-09-02 22:31:53 +02:00
stream_entries_helper.rb Do not show follow button on moved or memorial accounts (#8546) 2018-08-31 20:33:01 +02:00