NerdNumber9 71c10df270 Merge branch 'master' of https://github.com/inorichi/tachiyomi ... # Conflicts: # README.md # app/.gitignore # app/build.gradle # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAboutController.kt # app/src/main/res/raw/changelog_release.xml		2018-06-09 19:52:02 -04:00
..
model	Merge upstream changes	2017-11-29 21:53:02 -05:00
online	Merge branch 'master' of https://github.com/inorichi/tachiyomi	2018-06-09 19:52:02 -04:00
CatalogueSource.kt	Upstream merge	2017-05-04 23:38:17 -04:00
ConfigurableSource.kt	Downloading extensions from Github Repo. (#1101)	2018-02-05 22:50:56 +01:00
LocalSource.kt	Merge upstream changes	2017-11-29 21:53:02 -05:00
Source.kt	Upstream merge	2017-05-04 23:38:17 -04:00
SourceFactory.kt	Allow multiple sources in each extension source apk (#761)	2017-04-27 20:15:55 +02:00
SourceManager.kt	More work on Hitomi.la	2018-04-14 15:50:05 -04:00