merge from devel

This commit is contained in:
denise 2012-12-03 11:06:56 -05:00
parent 2f0c6b702a
commit b2699fa914
17 changed files with 143 additions and 84 deletions

View file

@ -1,3 +1,3 @@
<?php
define('AIRTIME_VERSION', '2.2.0');
define('AIRTIME_VERSION', '2.2.1');

View file

@ -100,4 +100,8 @@ if (strcmp($version, "2.2.0") < 0) {
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.2.0/airtime-upgrade.php");
pause();
}
if (strcmp($version, "2.2.1") < 0) {
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.2.1/airtime-upgrade.php");
pause();
}
echo "******************************* Upgrade Complete *******************************".PHP_EOL;