Merge branch 'dev' into refactoring-android

# Conflicts:
#	client/CMakeLists.txt
This commit is contained in:
albexk 2023-08-19 14:48:46 +03:00
commit 92db453f81
16 changed files with 78 additions and 41 deletions

View file

@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
set(PROJECT AmneziaVPN)
project(${PROJECT} VERSION 3.0.8.1
project(${PROJECT} VERSION 3.0.9.1
DESCRIPTION "AmneziaVPN"
HOMEPAGE_URL "https://amnezia.org/"
)
set(RELEASE_DATE "2023-07-15")
set(RELEASE_DATE "2023-08-16")
set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")