Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Martin Konecny 2012-08-03 15:59:48 -04:00
commit 56961e5f48
2 changed files with 3 additions and 3 deletions

View File

@ -68,8 +68,8 @@ else
fi
#Install Sourcefabric's custom Liquidsoap debian package
apt-get install -y --force-yes sourcefabric-keyring
apt-get install -y liquidsoap
apt-get -y --force-yes install sourcefabric-keyring
apt-get -y --force-yes install liquidsoap
# Apache Config File

@ -1 +1 @@
Subproject commit e62b9e552d7d656cddabfdc3c384c86f8b97fd4a
Subproject commit 492242f4bb7367afebbf2f096067cb5a5d3c0449