Merge upstream

This commit is contained in:
Eugen Rochko 2017-03-10 04:35:08 +01:00
commit 473f7f75f1
6 changed files with 45 additions and 6 deletions

View file

@ -162,5 +162,6 @@
<string name="action_unmute">Unmute</string>
<string name="error_unmuting">That user wasn\'t unmuted.</string>
<string name="error_muting">That user wasn\'t muted.</string>
<string name="search">Search accounts...</string>
</resources>