Mastodon/mastodon-app-ufficiale-iphone-ios
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2025-01-13 17:44:12 +01:00
Code Issues Projects Releases Wiki Activity
f6dabb5e36
mastodon-app-ufficiale-ipho.../CoreDataStack
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
Protocol
Stack
CoreDataStack.h
CoreDataStack.swift feat: [WIP] add profile scene 2021-04-01 14:39:15 +08:00
Info.plist