Merge branch 'dev' into refactoring/android
This commit is contained in:
commit
c8d2399db9
69 changed files with 5605 additions and 753 deletions
|
|
@ -21,6 +21,7 @@ namespace amnezia
|
|||
constexpr char dns2[] = "dns2";
|
||||
|
||||
constexpr char description[] = "description";
|
||||
constexpr char name[] = "name";
|
||||
constexpr char cert[] = "cert";
|
||||
constexpr char config[] = "config";
|
||||
|
||||
|
|
@ -79,6 +80,8 @@ namespace amnezia
|
|||
constexpr char sftp[] = "sftp";
|
||||
constexpr char awg[] = "awg";
|
||||
|
||||
constexpr char configVersion[] = "config_version";
|
||||
|
||||
constexpr char splitTunnelSites[] = "splitTunnelSites";
|
||||
constexpr char splitTunnelType[] = "splitTunnelType";
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue