Commit 08ed9e9
committed
IOS-5068 Merge remote-tracking branch 'origin/main' into ios-5068-release-to-main
# Conflicts:
# Anytype.xcodeproj/project.pbxproj
# Anytype/Sources/PresentationLayer/Modules/HomeWidgets/Widgets/SpaceChat/SpaceChatWidgetView.swift
# Libraryfile
# Modules/Loc/Sources/Loc/Resources/Auth.xcstrings
# Modules/ProtobufMessages/Sources/Protocol/Commands/Anytype_Rpc.File.SetAutoDownload.swift
# Modules/ProtobufMessages/Sources/Protocol/Commands/Anytype_Rpc.PushNotification.Mode.swift
# Modules/ProtobufMessages/Sources/Protocol/Commands/Anytype_Rpc.PushNotification.ResetIds.swift
# Modules/ProtobufMessages/Sources/Protocol/Commands/Anytype_Rpc.PushNotification.SetForceModeIds.swift
# Modules/ProtobufMessages/Sources/Protocol/Commands/Anytype_Rpc.Space.InviteView.swift
# Modules/ProtobufMessages/Sources/Protocol/Events/Anytype_Event.Membership.TiersUpdate.swift
# Modules/ProtobufMessages/Sources/Protocol/Events/Anytype_Event.Space.SyncStatus.swift
# Modules/ProtobufMessages/Sources/Protocol/Models/Anytype_Model_InvitePayload.swiftFile tree
2 files changed
+1071
-8
lines changed- Modules/Loc/Sources/Loc
- Generated
- Resources
2 files changed
+1071
-8
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
17 | 23 | | |
18 | 24 | | |
19 | 25 | | |
| |||
91 | 97 | | |
92 | 98 | | |
93 | 99 | | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
94 | 105 | | |
95 | 106 | | |
96 | 107 | | |
| |||
103 | 114 | | |
104 | 115 | | |
105 | 116 | | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
106 | 125 | | |
107 | 126 | | |
108 | 127 | | |
| |||
0 commit comments