zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity
mastodon-ios/Mastodon/Scene
History
CMK 499ddeb169 Merge branch 'develop' into feature/profile 
# Conflicts:
#	CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents
#	Localization/app.json
#	Mastodon.xcodeproj/project.pbxproj
 		2021-04-01 14:53:24 +08:00
..
Compose Merge branch 'develop' into feature/profile 2021-04-01 14:53:24 +08:00
HomeTimeline feat: [WIP] add profile scene 2021-04-01 14:39:15 +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 2021-04-01 14:53:24 +08:00
Profile feat: [WIP] add profile scene 2021-04-01 14:39:15 +08:00
PublicTimeline feat: [WIP] add profile scene 2021-04-01 14:39:15 +08:00
Search chore: remove useless code 2021-04-01 11:50:35 +08:00
Share feat: [WIP] add profile scene 2021-04-01 14:39:15 +08:00