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

Merge branch '2.1.x' into devel

This commit is contained in:
Cliff 2012-08-03 14:25:54 -04:00
parent c3783a15b2 17e2417f18
commit edd4cbba13
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install_full/ubuntu/airtime-full-install
View File

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

2
python_apps/pypo/liquidsoap_bin

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