1
0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2024-12-08 22:56:41 +01:00
Commit Graph

3 Commits

Author SHA1 Message Date
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
CMK
64f3d2fe3a chore: [WIP] move core logic into package 2022-09-30 19:28:09 +08:00
CMK
78b2259b8f chore: replace CocoaPods-Keys with Arkana 2022-07-15 11:34:16 +08:00