Merge branch 'master' into remote-desktop

This commit is contained in:
Evgeny Poberezkin committed 2023-11-06 11:44:12 +00:00
commit 2776d864a8
14 files changed
+781 -526

No files matched your search

+2 -1
View File
@@ -1956,7 +1956,8 @@ processChatCommand = \case
DeleteRemoteCtrl rc -> withUser_ $ deleteRemoteCtrl rc >> ok_
QuitChat -> liftIO exitSuccess
ShowVersion -> do
let versionInfo = coreVersionInfo $(simplexmqCommitQ)
-- simplexmqCommitQ makes iOS builds crash m(
let versionInfo = coreVersionInfo "" -- $(simplexmqCommitQ)
chatMigrations <- map upMigration <$> withStore' (Migrations.getCurrent . DB.conn)
agentMigrations <- withAgent getAgentMigrations
pure $ CRVersionInfo {versionInfo, chatMigrations, agentMigrations}