Merge branch 'master' into titles_and_filters

2015-08-17 14:53:48 +02:00
parent 43f8db8e3a fab31c9c2e
commit f485225250
45 changed files with 473 additions and 46 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -46,6 +46,7 @@ en:
        one: 1 vote
        other: "%{count} votes"
    comment:
+      deleted: This comment has been deleted
      responses:
        zero: No Responses
        one: 1 Response