1
0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2025-01-24 14:30:47 +01:00
mastodon-app-ufficiale-ipho.../Mastodon.xcodeproj
CMK f0b08e2b56 Merge branch 'develop' into feature/welcome-illustration
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
#	Mastodon/Extension/MastodonSDK/Mastodon+Entidy+ErrorDetailReason.swift
2021-03-16 15:42:15 +08:00
..
project.xcworkspace
xcuserdata/mainasuk.xcuserdatad/xcschemes feat: add multipart helper. Add update credentials endpoint 2021-03-08 18:17:15 +08:00
project.pbxproj Merge branch 'develop' into feature/welcome-illustration 2021-03-16 15:42:15 +08:00