Merge branch 'stable' into develop

This commit is contained in:
Jonne Haß 2016-01-05 21:34:11 +01:00
commit 764a3fec1d

View file

@ -182,9 +182,6 @@ en:
video_title:
unknown: "Unknown video title"
aspects:
zero: "No aspects"
one: "1 aspect"
other: "%{count} aspects"
contacts_visible: "Contacts in this aspect will be able to see each other."
contacts_not_visible: "Contacts in this aspect will not be able to see each other."
edit: