Commit Graph

3 Commits

Author SHA1 Message Date
AbdallahMehiz
68a1e1756d
merge remains 2024-02-03 17:17:01 +01:00
AbdallahMehiz
05797a2433
Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
#	core/common/src/main/kotlin/eu/kanade/tachiyomi/util/storage/SevenZUtil.kt
#	source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt
2024-02-03 17:00:15 +01:00
AntsyLich
aa498360db
Move :core to :core:common 2024-01-29 15:20:21 +06:00