mastodon-ios

mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00

History

ihugo f6dabb5e36 Merge branch 'develop' into feature/settings-rebase

# Conflicts:
#	CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents
#	Localization/app.json
#	Mastodon/Generated/Assets.swift
#	Mastodon/Generated/Strings.swift
#	Mastodon/Resources/en.lproj/Localizable.strings
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift

2021-04-17 14:13:01 +08:00

CoreData.xcdatamodeld/CoreData.xcdatamodel

Merge branch 'develop' into feature/settings-rebase

2021-04-17 14:13:01 +08:00

Entity

Merge branch 'develop' into feature/settings-rebase

2021-04-17 14:13:01 +08:00

Extension

feat: add APIService.Persist.persistTimeline method and make public timeline load oldest works

2021-02-04 14:45:44 +08:00

Protocol

feat: add APIService.Persist.persistTimeline method and make public timeline load oldest works