CMK 313b840013 Merge branch 'support-japanese' into develop ... # Conflicts: # Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist		2021-08-06 14:00:04 +08:00
..
project.xcworkspace	Initial Commit	2021-01-22 13:54:11 +08:00
xcshareddata/xcschemes	chore: update i18n and version to 1.0.0 (49)	2021-07-28 11:05:28 +08:00
xcuserdata/mainasuk.xcuserdatad/xcschemes	chore: update version to 1.0.3 (53)	2021-08-05 19:58:56 +08:00
project.pbxproj	Merge branch 'support-japanese' into develop	2021-08-06 14:00:04 +08:00