Morgan Pretty 7165b9e4f6 Merge branch 'dev' into feature/remove-OWSBlockingManager ... # Conflicts: # Session/Conversations/ConversationVC+Interaction.swift # Session/Meta/AppDelegate.swift # SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift # SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift		2022-03-24 16:51:34 +11:00
..
Database	Cleaned up some config sync logic and allowed migrations to trigger them	2022-03-24 10:03:51 +11:00
Media Viewing & Editing	Fixed a couple of build errors due to merging dev	2022-02-07 11:38:33 +11:00
Messaging	Merge branch 'dev' into feature/remove-OWSBlockingManager	2022-03-24 16:51:34 +11:00
Meta	Cleaned up some config sync logic and allowed migrations to trigger them	2022-03-24 10:03:51 +11:00
Profile Pictures	Updated the casing for the avatar text	2022-03-10 16:09:42 +11:00
Screen Lock	Re-organize files	2021-01-12 11:25:31 +11:00
Shared View Controllers	Added a loading state when approving a message request	2022-03-01 16:48:47 +11:00
Shared Views	Re-organize files	2021-01-12 11:25:31 +11:00
To Do	Removed the OWSBlockingManager replacing it with the config sync	2022-03-23 09:59:38 +11:00
Utilities	Cleaned up some config sync logic and allowed migrations to trigger them	2022-03-24 10:03:51 +11:00
Configuration.swift	Delete V1 OGS & file server	2021-05-04 15:46:48 +10:00