Mastodon/mastodon-app-ufficiale-iphone-ios
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2024-12-13 17:17:35 +01:00
Code Issues Projects Releases Wiki Activity
060aec6bcb
mastodon-app-ufficiale-ipho.../Mastodon.xcodeproj
History
CMK 060aec6bcb Merge branch 'release-1.4.6' into feature/package-refactor 
# Conflicts:
#	.arkana.yml
#	AppShared/Info.plist
#	Documentation/Setup.md
#	Gemfile
#	Gemfile.lock
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
#	Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	MastodonSDK/Package.swift
#	MastodonSDK/Sources/MastodonCore/AppSecret.swift
#	MastodonSDK/Sources/MastodonCore/Service/Notification/NotificationService.swift
#	Podfile
#	Podfile.lock
2022-11-01 14:14:00 +08:00
..
project.xcworkspace
xcshareddata/xcschemes chore: fix compile issue 2022-10-09 21:40:02 +08:00
xcuserdata/mainasuk.xcuserdatad/xcschemes Merge branch 'release-1.4.6' into feature/package-refactor 2022-11-01 14:14:00 +08:00
project.pbxproj Merge branch 'release-1.4.6' into feature/package-refactor 2022-11-01 14:14:00 +08:00