AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into feature/download-native-wireguard-config-on-connect

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-04-08 19:45:46 +03:00
commit e47997875f
209 changed files with 1904 additions and 1503611 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/configurators/shadowsocks_configurator.h
View file

@ -10,8 +10,7 @@ class ShadowSocksConfigurator : ConfiguratorBase
{
Q_OBJECT
public:
ShadowSocksConfigurator(std::shared_ptr<Settings> settings,
std::shared_ptr<ServerController> serverController, QObject *parent = nullptr);
ShadowSocksConfigurator(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
QString genShadowSocksConfig(const ServerCredentials &credentials, DockerContainer container,
const QJsonObject &containerConfig, ErrorCode &errorCode);