Merge remote-tracking branch 'origin/master' into 2.2

This commit is contained in:
Jeremy Benoist
2016-10-24 12:03:17 +02:00
82 changed files with 654 additions and 1569 deletions

View File

@ -456,6 +456,9 @@ user:
# delete_confirm: Are you sure?
# back_to_list: Back to list
error:
# page_title: An error occurred
flashes:
config:
notice: