Isaac 26b539041d Fix merge conflicts

2024-06-07 15:44:12 +04:00

..

AccountContext.h

…

AccountContext.swift

Fix merge conflicts

2024-06-07 15:44:12 +04:00

AttachmentMainButtonState.swift

…

ChatController.swift

Various improvements

2024-06-07 09:51:45 +04:00

ChatHistoryLocation.swift

…

ChatListController.swift

…

ContactMultiselectionController.swift

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

2024-04-22 19:28:37 +04:00

ContactSelectionController.swift

Message preview improvements

2024-05-17 17:10:19 +04:00

CountriesConfiguration.swift

…

DeviceContactData.swift

…

DeviceContactDataManager.swift

…

DownloadedMediaStoreManager.swift

…

FetchManager.swift

…

FetchMediaUtils.swift

…

GalleryController.swift

Various improvements

2024-03-12 17:43:21 +04:00

GlobalExperimentalSettings.swift

[WIP] Stickers editor

2024-04-11 14:15:37 +04:00

IsMediaStreamable.swift

…

LiveLocationManager.swift

…

MediaManager.swift

[WIP] Business

2024-02-16 22:52:01 +04:00

OpenChatMessage.swift

Saved message improvements

2024-01-29 21:23:19 +01:00

OverlayAudioPlayerController.swift

…

OverlayMediaItemNode.swift

…

OverlayMediaManager.swift

…

PeerNameColors.swift

Folder colors

2024-02-28 23:35:14 +04:00

PeerSelectionController.swift

Message preview improvements

2024-05-17 17:10:19 +04:00

PeersNearbyManager.swift

…

Premium.swift

Various fixes

2024-05-26 18:44:31 +04:00

PresentationCallManager.swift

…

PresentationSurfaceLevels.swift

…

SharedMediaPlayer.swift

[WIP] View-once audio messages

2023-12-29 04:50:22 +04:00

ThemeUpdateManager.swift

…

UniversalVideoNode.swift

[WIP] Stickers editor

2024-04-06 18:08:20 +04:00

WallpaperUploadManager.swift

…

WatchManager.swift

…