Merge branch 'master' into moderator_comments

This commit is contained in:
Juanjo Bazán
2015-08-24 19:01:49 +02:00
14 changed files with 63 additions and 22 deletions

View File

@@ -147,4 +147,4 @@ es:
manage:
all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}."
welcome:
last_debates: Úlitmos debates
last_debates: Últimos debates