Merge upstream changes

This commit is contained in:
NerdNumber9
2017-11-23 21:03:49 -05:00
committed by NerdNumber9
210 changed files with 6140 additions and 1779 deletions

View File

@@ -1,7 +1 @@
**Please read https://github.com/inorichi/tachiyomi/blob/master/.github/CONTRIBUTING.md before posting**
Remove line above and describe your issue here. Fill out version below. Use Preview.
Version: r000 or v0.0.0
(other relevant info like OS)