Merge branch 'master' into light-theme

2020-03-04 19:58:03 +05:00
parent 1008b8611d 3f4db112b1
commit d557999a38
31 changed files with 587 additions and 85 deletions
--- a/app/src/main/res/values/credits.xml
+++ b/app/src/main/res/values/credits.xml
@@ -2,7 +2,7 @@
 <resources>

    <string-array name="creditsInfo">
-        <item>Logo by Kasun <a href="https://mastodon.social/@kasun">@kasun</a></item>
+        <item>Removed</item>
    </string-array>

 </resources>
--- a/app/src/main/res/values/sponsors.xml
+++ b/app/src/main/res/values/sponsors.xml
@@ -7,6 +7,8 @@
        <item>Ljoonal <a href="https://mastodon.ljoonal.xyz/@ljoonal">@ljoonal</a></item>
        <item>Tobias <a href="https://www.patreon.com/user/creators?u=20367132">@Tobias</a></item>
        <item>Sameer Gupta</item>
+        <item>Yin Yihang</item>
+        <item>Svierne</item>
    </string-array>

 </resources>