David Yip b0993a5fdf Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: config/i18n-tasks.yml		2018-03-18 20:21:17 -05:00
..
admin	…
settings	…
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	…
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	…
mailer_helper.rb	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
routing_helper.rb	…
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