about summary refs log tree commit diff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-28 22:45:17 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-01-28 22:45:17 -0600
commitf4b2478af11bd5e2125eb245bda4fda7577817d1 (patch)
tree6a09934546f4e2ad8db8d43372ac3192834a42f1 /app/views/layouts
parent00ce2be148a06ddd7e692ce963dfab356e331629 (diff)
parente14c20582f9f455ade989307016e6726cb8ff959 (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
 Conflicts:
	app/views/layouts/mailer.html.haml
	config/locales/ko.yml
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/mailer.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index ad15754d5..6321fec61 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -7,7 +7,7 @@
     %title/
 
     = stylesheet_pack_tag 'core/mailer'
-  %body
+  %body{ dir: locale_direction }
     %table.email-table{ cellspacing: 0, cellpadding: 0 }
       %tbody
         %tr