Merge remote-tracking branch 'refs/remotes/origin-ssh/master'

This commit is contained in:
Matthew Wild 2021-09-21 22:27:13 +01:00
commit 3fd4dd1989
3 changed files with 14 additions and 0 deletions

View file

@ -14,6 +14,7 @@
3759637F26F7312A00831F4C /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3759638126F7312A00831F4C /* Settings.storyboard */; };
3759638626F7317D00831F4C /* Account.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3759638826F7317D00831F4C /* Account.storyboard */; };
3759638D26F7320F00831F4C /* MIX.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3759638F26F7320F00831F4C /* MIX.storyboard */; };
3759A58C26F8C7CC002987B2 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3759A58E26F8C7CC002987B2 /* Localizable.strings */; };
3776C43526EDC5F00047750B /* MessageStyling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3776C43426EDC5F00047750B /* MessageStyling.swift */; };
3797D5BD26E9E42E0091DAF8 /* AvatarColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3797D5BC26E9E42E0091DAF8 /* AvatarColors.swift */; };
3797D5C026EA456F0091DAF8 /* HSLuvSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 3797D5BF26EA456F0091DAF8 /* HSLuvSwift */; };
@ -327,6 +328,8 @@
3759639126F7322300831F4C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MIX.strings; sourceTree = "<group>"; };
3759639326F7325100831F4C /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/MIX.strings; sourceTree = "<group>"; };
3759639426F7481200831F4C /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Base; path = Base.lproj/Info.plist; sourceTree = "<group>"; };
3759A58D26F8C7CC002987B2 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
3759A58F26F8C7CF002987B2 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = "<group>"; };
3776C43426EDC5F00047750B /* MessageStyling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageStyling.swift; sourceTree = "<group>"; };
3797D5BC26E9E42E0091DAF8 /* AvatarColors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarColors.swift; sourceTree = "<group>"; };
379D914926E8A0E300B877CA /* db-schema-15.sql */ = {isa = PBXFileReference; lastKnownFileType = text; path = "db-schema-15.sql"; sourceTree = "<group>"; };
@ -928,6 +931,7 @@
3759638F26F7320F00831F4C /* MIX.storyboard */,
FE80BDA91D92974C001914B0 /* Snikket.entitlements */,
3759636126F72F1900831F4C /* Welcome.storyboard */,
3759A58E26F8C7CC002987B2 /* Localizable.strings */,
);
path = Snikket;
sourceTree = "<group>";
@ -1250,6 +1254,7 @@
3759637126F7303100831F4C /* VoIP.storyboard in Resources */,
FE94E52C1CCBA74F00FAE755 /* Main.storyboard in Resources */,
FEE49DCC2424C03200900BBB /* Conversation.storyboard in Resources */,
3759A58C26F8C7CC002987B2 /* Localizable.strings in Resources */,
3759638626F7317D00831F4C /* Account.storyboard in Resources */,
3759638D26F7320F00831F4C /* MIX.storyboard in Resources */,
FE2809812167CE18002F5BD0 /* server_features_list.xml in Resources */,
@ -1607,6 +1612,15 @@
name = Info.plist;
sourceTree = "<group>";
};
3759A58E26F8C7CC002987B2 /* Localizable.strings */ = {
isa = PBXVariantGroup;
children = (
3759A58D26F8C7CC002987B2 /* en */,
3759A58F26F8C7CF002987B2 /* da */,
);
name = Localizable.strings;
sourceTree = "<group>";
};
FE4DDF571F39E0B500A4CE5A /* MainInterface.storyboard */ = {
isa = PBXVariantGroup;
children = (

Binary file not shown.

Binary file not shown.