Merge branch 'normalize-strings' of https://github.com/alerque/Tusky into alerque-normalize-strings

Conflicts: app/src/main/res/values-ja/strings.xml
2017-04-23 17:42:34 -04:00 · 2017-04-23 17:42:34 -04:00 · ff56a6ca62
commit ff56a6ca62
parent 322f89863d 61d79ff28e
6 changed files with 129 additions and 42 deletions
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -161,5 +161,4 @@
    <string name="description_account_locked">非公開アカウント</string>
    <string name="status_share_content">トゥートの内容を共有</string>
    <string name="status_share_link">トゥートへのリンクを共有</string>
-
 </resources>