David Yip f61aa8e0f7 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb		2018-03-27 10:26:47 -05:00
..
admin	Fix nil error in log_target_from_history helper (#6173)	2018-01-04 10:56:23 +09:00
settings	Set up /settings/keyword_mutes. #164.	2017-10-21 14:54:36 -05:00
application_helper.rb	Add direction tags to HTML e-mails for RTL languages (#6373)	2018-01-29 00:22:20 +01:00
flashes_helper.rb	Clean up flash display in views (#2336)	2017-04-23 04:22:34 +02:00
home_helper.rb
instance_helper.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	2018-03-04 20:29:49 +01:00
jsonld_helper.rb	Validate HTTP response length while receiving (#6891)	2018-03-26 14:02:10 +02:00
mailer_helper.rb	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
routing_helper.rb	Fallback default thumbnail in instance status API (#6177)	2018-01-04 15:36:55 +01:00
settings_helper.rb	armenian translations initial commit (#6320)	2018-01-22 05:02:23 +09:00
stream_entries_helper.rb	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	2018-03-18 20:33:07 +01:00