Merge branch 'develop' into luke/groups-room-directory-esque

This commit is contained in:
Luke Barnard 2017-10-13 17:48:35 +02:00 committed by GitHub
commit 83e7fc242a
3 changed files with 29 additions and 8 deletions

View file

@ -918,5 +918,7 @@
"This room has no related groups": "This room has no related groups",
"New group ID (e.g. +foo:%(localDomain)s)": "New group ID (e.g. +foo:%(localDomain)s)",
"%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
"Add rooms to this group": "Add rooms to this group"
"Add rooms to this group": "Add rooms to this group",
"Invites sent": "Invites sent",
"Your group invitations have been sent.": "Your group invitations have been sent."
}