Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.3.x' into devel

Browse source 
Conflicts:
	debian/postinst
This commit is contained in:
Martin Konecny 2013-04-02 12:31:48 -04:00
commit 563f5b64d2
7 changed files with 3284 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/postinst vendored
View file

@ -229,7 +229,7 @@ case "$1" in
echo "Upgrades from Airtime versions before 2.1.0 are not supported. Please back up your files and perform a clean install."
elif [ "${APACHESETUP}" == "no thanks" ]; then
echo "Please run the ${tmpdir}/install_minimal/airtime-install script after you have set up the web server."
echo "Please run the ${tmpdir}/install_minimal/airtime-install script with the -d option after you have set up the web server."
else