Merge branch 'master' into master-android

This commit is contained in:
Evgeny Poberezkin
2024-07-15 23:06:44 +01:00
169 changed files with 4857 additions and 1847 deletions
-1
View File
@@ -12,7 +12,6 @@ for lang in "${langs[@]}"; do
xcodebuild -importLocalizations \
-project ./apps/ios/SimpleX.xcodeproj \
-localizationPath ./apps/ios/SimpleX\ Localizations/$lang.xcloc \
-disableAutomaticPackageResolution \
-skipPackageUpdates
sleep 10
done
+1 -1
View File
@@ -1,5 +1,5 @@
{
"https://github.com/simplex-chat/simplexmq.git"."017469b2de65c7e3ef1d680c2da466b320d1b061" = "1c6aap31sa4wdv7x771q2l8bs499qg58rrnx80blj33y2zl877c9";
"https://github.com/simplex-chat/simplexmq.git"."b40d55c358ebabeb6cf1eca8e64016e2bae09a15" = "1ppn2yvml12yr5k5d6hjn7r7xy6a83ig9mys49jzzk034rzwxcd2";
"https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
"https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
"https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";