CMK fbe3a8c419 Merge branch 'develop' into feature/profile-coordinator ...

# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Coordinator/SceneCoordinator.swift
#	Mastodon/Scene/Share/View/Content/StatusView.swift
#	Mastodon/Scene/Share/View/TableviewCell/StatusTableViewCell.swift

2021-04-07 16:55:07 +08:00

..

Compose

Merge branch 'develop' into feature/profile-coordinator

2021-04-07 16:55:07 +08:00

HashtagTimeline

chore: migrate HashtagViewModel to use StatusFetchedResultsController

2021-04-07 16:37:05 +08:00

HomeTimeline

chore: update color asset

2021-04-06 16:42:45 +08:00

MainTab

feat: [WIP] add profile scene

2021-04-01 14:39:15 +08:00

Notification

feat: update navigation bar items

2021-02-23 16:45:00 +08:00

Onboarding

Merge branch 'develop' into feature/profile-coordinator

2021-04-07 16:55:07 +08:00

Profile

Merge branch 'develop' into feature/profile-coordinator

2021-04-07 16:55:07 +08:00

PublicTimeline

feat: [WIP] add profile scene

2021-04-01 14:39:15 +08:00

Search

Merge branch 'develop' into feature/profile-coordinator

2021-04-07 14:44:58 +08:00

Share

Merge branch 'develop' into feature/profile-coordinator

2021-04-07 16:55:07 +08:00

Webview

fix: Update server rules scene UI design

2021-04-01 14:40:58 +08:00