NerdNumber9 615fa05a75 Merge branch 'master' of https://github.com/inorichi/tachiyomi ...

# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
#	app/src/main/res/layout/manga_info_controller.xml
#	app/src/main/res/raw/changelog_release.xml

2018-03-13 15:58:47 -04:00

..

AnilistLoginActivity.kt

Merge upstream changes

2017-11-29 21:53:02 -05:00

PreferenceDSL.kt

Include minor changes from extensions PR

2018-01-09 12:27:45 +01:00

SettingsAboutController.kt

Merge remote-tracking branch 'upstream/master'

2018-01-29 12:16:32 -05:00

SettingsAdvancedController.kt

Various changes

2017-11-29 21:44:35 -05:00

SettingsBackupController.kt

Run periodic backups without launching services

2018-02-18 20:14:12 +01:00

SettingsController.kt

Include minor changes from extensions PR

2018-01-09 12:27:45 +01:00

SettingsDownloadController.kt

Remove simultaneous downloads

2018-02-18 17:34:22 +01:00

SettingsEhController.kt

Implement lenient sync

2018-02-23 18:57:19 -05:00

SettingsGeneralController.kt

Merge branch 'master' of https://github.com/inorichi/tachiyomi

2018-03-13 15:58:47 -04:00

SettingsMainController.kt

Merge branch 'master' of https://github.com/inorichi/tachiyomi

2017-12-07 23:20:27 -05:00

SettingsNhController.kt

Various changes

2017-11-29 21:44:35 -05:00

SettingsReaderController.kt

Add option to change double tap animation speed in the reader (#974)

2018-01-26 20:22:31 +01:00

SettingsSourcesController.kt

Merge branch 'master' of https://github.com/inorichi/tachiyomi

2018-03-13 15:58:47 -04:00

SettingsTrackingController.kt

Preferences with conductor (#792)

2017-05-14 00:45:14 +02:00