David Yip f4b2478af1

Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	app/views/layouts/mailer.html.haml
	config/locales/ko.yml

2018-01-28 22:45:17 -06: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

…

jsonld_helper.rb

…

mailer_helper.rb

…

routing_helper.rb

…

settings_helper.rb

…

stream_entries_helper.rb

…