Changeset [9e43fb163fa9ae4cde4e66a38305c2a0d2f6f2f7] by dogmatic69
Revision 9e43fb163fa9ae4cde4e66a38305c2a0d2f6f2f7,
committed by dogmatic69
· March 6th, 2012 @ 07:38 PM
Merge branch 'beta' of github.com:infinitas/infinitas into beta
Conflicts:
Core/Installer/Controller/InstallController.php
Core/Installer/Lib/InstallerLib.php
Core/Installer/Lib/ReleaseVersion.php
https://github.com/infinitas/infinitas/commit/9e43fb163fa9ae4cde4e6...
10 changed files
-
M
Core/Installer/Config/database.install -
M
Core/Installer/Controller/InstallController.php -
M
Core/Installer/Lib/InstallerLib.php -
M
Core/Installer/Lib/ReleaseVersion.php -
M
Core/Installer/Model/Install.php -
M
Core/Installer/View/Install/admin_user.ctp -
M
Core/Installer/View/Install/finish.ctp -
M
Core/Installer/View/Install/welcome.ctp -
M
Core/Libs/Controller/Component/WizardComponent.php -
M
View/Helper/AppHelper.php