Merge branch 'master' into 'settable-paths'

# Conflicts:
#   src/nsis/i2pbrowser-version.nsi
#   src/win/i2pbrowser-private.bat
#   src/win/i2pbrowser.bat
This commit is contained in:
idk
2022-04-04 17:55:42 +00:00
4 changed files with 20 additions and 5 deletions

View File

@@ -11,7 +11,7 @@ VERSION=i2p-"$I2P_VERSION"
export VERSION="$VERSION"
#Uncomment this to build from the tip of the master.
#I2P_VERSION=0.9.50
#export I2P_VERSION=0.9.50
#I2P_VERSION=1.7.0
#export I2P_VERSION=1.7.0
#VERSION=master
#export VERSION="$VERSION"