Merge branch 'master' into notifications

2016-01-08 15:07:16 +01:00
parent 3fa8ab18c6 2f6aa834d1
commit 307b29736d
13 changed files with 100 additions and 32 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -243,6 +243,8 @@ en:
      form:
        submit_button: "Save changes"
  comments:
+    show:
+      return_to_commentable: "Go back to "
    select_order: "Sort by"
    orders:
      most_voted: "Most voted"