Merge branch 'cc-2281-Install-script-should-check-for-pre-installed-versions-and-prompt-user-to-upgrade/full-installation' of dev.sourcefabric.org:campcaster into cc-2281-Install-script-should-check-for-pre-installed-versions-and-prompt-user-to-upgrade/full-installation
Conflicts: install/airtime-install.php
This commit is contained in:
commit
8eaf05704e