Shinokuni 1a727f1f1b Merge branch 'refs/heads/master' into develop
# Conflicts:
#	api/src/test/java/com/readrops/api/services/nextcloudnews/NextcloudNewsDataSourceTest.kt
#	db/src/main/java/com/readrops/db/dao/ItemDao.kt
2024-12-02 16:48:07 +01:00
..
2024-07-03 16:21:29 +02:00
2024-08-18 13:11:27 +02:00