Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-12-18 12:35:07 +00:00
commit 1e4997c2c2
1 changed files with 2 additions and 0 deletions

View File

@ -1,3 +1,5 @@
<!-- Please report security issues by email to security@matrix.org -->
<!-- This is a bug report template. By following the instructions below and
filling out the sections with your information, you will help the us to get all
the necessary data to fix your issue.