David Yip ab04be2f84

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

…

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

…

routing_helper.rb

…

settings_helper.rb

…

stream_entries_helper.rb

Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)

2018-03-18 20:33:07 +01:00