Merge branch 'develop' into travis/soft-logout-copy

This commit is contained in:
Travis Ralston 2019-07-11 14:47:13 -06:00
commit 5958cf0693
3 changed files with 11 additions and 3 deletions

View file

@ -1108,6 +1108,7 @@
"Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?",
"Invite anyway and never warn me again": "Invite anyway and never warn me again",
"Invite anyway": "Invite anyway",
"Please tell us what went wrong or, better, a github issue that describes the problem.": "Please tell us what went wrong or, better, a github issue that describes the problem.",
"Preparing to send logs": "Preparing to send logs",
"Logs sent": "Logs sent",
"Thank you!": "Thank you!",