diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 534c92223..e0b40dee6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -34,7 +34,7 @@ jobs: cd Telegram/build/docker/centos_env poetry install DEBUG= poetry run gen_dockerfile | docker buildx build -t $IMAGE_TAG - - + - name: Push the Docker image. if: ${{ github.ref_name == github.event.repository.default_branch }} run: | diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index 4d8686113..3a353fd57 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -48,7 +48,7 @@ std::map<int, const char*> BetaLogs() { "- Fix a memory leak in RTMP livestreams.\n" "- Fix some bot webview bugs on macOS.\n" - + "- Fix forwarding of voice messages.\n" } }; diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 412001ce5..8b3edd076 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -977,14 +977,14 @@ depends:yasm/yasm --enable-muxer=opus make $MAKE_THREADS_CNT - + mkdir out.x86_64 mv libavformat/libavformat.a out.x86_64 mv libavcodec/libavcodec.a out.x86_64 mv libswresample/libswresample.a out.x86_64 mv libswscale/libswscale.a out.x86_64 mv libavutil/libavutil.a out.x86_64 - + lipo -create out.arm64/libavformat.a out.x86_64/libavformat.a -output libavformat/libavformat.a lipo -create out.arm64/libavcodec.a out.x86_64/libavcodec.a -output libavcodec/libavcodec.a lipo -create out.arm64/libswresample.a out.x86_64/libswresample.a -output libswresample/libswresample.a diff --git a/Telegram/cmake/lib_stripe.cmake b/Telegram/cmake/lib_stripe.cmake index b57b15f6a..249e26163 100644 --- a/Telegram/cmake/lib_stripe.cmake +++ b/Telegram/cmake/lib_stripe.cmake @@ -43,7 +43,7 @@ PRIVATE smartglocal/smartglocal_error.h smartglocal/smartglocal_token.cpp smartglocal/smartglocal_token.h - + stripe/stripe_pch.h ) diff --git a/changelog.txt b/changelog.txt index 5a3b332ae..b28b929c2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -184,7 +184,7 @@ - Bring your custom animated stickers from other apps. - See smaller, compact animations when reacting to messages. - See real-time animations in chat when a user reacts to your message. -- React with additional emoji expressing love, appreciation, anger or surprise. +- React with additional emoji expressing love, appreciation, anger or surprise. - Tap the new button in chats to jump to your messages that have unseen reactions. - Watch the animations for unseen reactions play when you hit the button. - The app will warn you before closing if you are uploading photos or files to a chat. @@ -257,7 +257,7 @@ - Clear messages in one-on-one chats from a specific day or date range. - Comment as one of your channels in public groups and channel comments. - When you request to join a community and its admin or bot-admin contacts you with a message, you will see which chat they are from at the top of the chat. -- Bot-admins can now ask users to complete tasks before they are allowed to join - like accepting community rules, passing a test, or making a donation to the content creators. +- Bot-admins can now ask users to complete tasks before they are allowed to join - like accepting community rules, passing a test, or making a donation to the content creators. 3.2.8 beta (01.12.21) @@ -283,7 +283,7 @@ 3.2.4 (13.11.21) - Fix editing of scheduled messages on macOS. -- Fix launching on Chrome OS in Crostini container. +- Fix launching on Chrome OS in Crostini container. 3.2.3 (08.11.21)