[PR #216] [MERGED] Merge master to dev #1676

New issue

Closed

opened 2026-10-13 20:46:43 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-13 20:46:43 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/216
Author: @pokamest
Created: 4/11/2023
Status: ✅ Merged
Merged: 4/11/2023
Merged by: @pokamest

Base: dev ← Head: master

📝 Commits (5)

7d09d41 Merge pull request #108 from amnezia-vpn/dev
891f990 Merge pull request #154 from amnezia-vpn/dev
a5e5c3d Merge pull request #210 from amnezia-vpn/dev
7351fe9 Spelling (#214)
af29637 Merge branch 'dev'

📊 Changes

69 files changed (+141 additions, -141 deletions)

View changed files

📝 README.md (+4 -4)
📝 client/CMakeLists.txt (+2 -2)
📝 client/android/shadowsocks/src/main/java/org/amnezia/vpn/shadowsocks/core/bg/BaseService.kt (+1 -1)
📝 client/android/shadowsocks/src/main/java/org/amnezia/vpn/shadowsocks/core/utils/Constants.kt (+1 -1)
📝 client/android/src/com/wireguard/crypto/Ed25519.java (+2 -2)
📝 client/android/src/org/amnezia/vpn/NotificationUtil.kt (+1 -1)
📝 client/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt (+2 -2)
📝 client/android/src/org/amnezia/vpn/Prefs.kt (+1 -1)
📝 client/android/src/org/amnezia/vpn/VPNLogger.kt (+3 -3)
📝 client/android/src/org/amnezia/vpn/VPNService.kt (+2 -2)
📝 client/android/src/org/amnezia/vpn/VPNServiceBinder.kt (+1 -1)
📝 client/android/src/org/amnezia/vpn/qt/VPNActivity.kt (+3 -3)
📝 client/cmake/osxtools.cmake (+1 -1)
📝 client/configurators/vpn_configurator.h (+1 -1)
📝 client/configurators/wireguard_configurator.cpp (+1 -1)
📝 client/containers/containers_defs.h (+3 -3)
📝 client/core/ipcclient.cpp (+2 -2)
📝 client/core/servercontroller.cpp (+4 -4)
📝 client/core/servercontroller.h (+1 -1)
📝 client/fastlane/Pluginfile (+1 -1)

...and 49 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amnezia-client/pull/216 **Author:** [@pokamest](https://github.com/pokamest) **Created:** 4/11/2023 **Status:** ✅ Merged **Merged:** 4/11/2023 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `master` --- ### 📝 Commits (5) - [`7d09d41`](https://github.com/amnezia-vpn/amnezia-client/commit/7d09d41a7df57d149f07e5a6443e1158a8f90873) Merge pull request #108 from amnezia-vpn/dev - [`891f990`](https://github.com/amnezia-vpn/amnezia-client/commit/891f990e35dc5c3c7a57dc0a355b00f2fab48e60) Merge pull request #154 from amnezia-vpn/dev - [`a5e5c3d`](https://github.com/amnezia-vpn/amnezia-client/commit/a5e5c3d941cf2bd332ecfc1d7c4f20efffaff3c6) Merge pull request #210 from amnezia-vpn/dev - [`7351fe9`](https://github.com/amnezia-vpn/amnezia-client/commit/7351fe96335e20e0303983881d0fede617ee2ac1) Spelling (#214) - [`af29637`](https://github.com/amnezia-vpn/amnezia-client/commit/af2963716371195480bae5c3855c3339274d2cda) Merge branch 'dev' ### 📊 Changes **69 files changed** (+141 additions, -141 deletions) <details> <summary>View changed files</summary> 📝 `README.md` (+4 -4) 📝 `client/CMakeLists.txt` (+2 -2) 📝 `client/android/shadowsocks/src/main/java/org/amnezia/vpn/shadowsocks/core/bg/BaseService.kt` (+1 -1) 📝 `client/android/shadowsocks/src/main/java/org/amnezia/vpn/shadowsocks/core/utils/Constants.kt` (+1 -1) 📝 `client/android/src/com/wireguard/crypto/Ed25519.java` (+2 -2) 📝 `client/android/src/org/amnezia/vpn/NotificationUtil.kt` (+1 -1) 📝 `client/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt` (+2 -2) 📝 `client/android/src/org/amnezia/vpn/Prefs.kt` (+1 -1) 📝 `client/android/src/org/amnezia/vpn/VPNLogger.kt` (+3 -3) 📝 `client/android/src/org/amnezia/vpn/VPNService.kt` (+2 -2) 📝 `client/android/src/org/amnezia/vpn/VPNServiceBinder.kt` (+1 -1) 📝 `client/android/src/org/amnezia/vpn/qt/VPNActivity.kt` (+3 -3) 📝 `client/cmake/osxtools.cmake` (+1 -1) 📝 `client/configurators/vpn_configurator.h` (+1 -1) 📝 `client/configurators/wireguard_configurator.cpp` (+1 -1) 📝 `client/containers/containers_defs.h` (+3 -3) 📝 `client/core/ipcclient.cpp` (+2 -2) 📝 `client/core/servercontroller.cpp` (+4 -4) 📝 `client/core/servercontroller.h` (+1 -1) 📝 `client/fastlane/Pluginfile` (+1 -1) _...and 49 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-13 20:46:43 +00:00

closed this issue
added the
pull-request
label

No labels

pull-request

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

amnezia-vpn/amnezia-client#1676

No description provided.

Rows
Columns