Merge branch '2.1.x' into devel
Conflicts: python_apps/pypo/install/pypo-initialize.py
This commit is contained in:
commit
656e5eb429
|
@ -94,7 +94,6 @@ try:
|
||||||
#liq_path DNE, which is OK.
|
#liq_path DNE, which is OK.
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
os.symlink(liq_path, symlink_path)
|
os.symlink(liq_path, symlink_path)
|
||||||
else:
|
else:
|
||||||
print " * Liquidsoap binary not found!"
|
print " * Liquidsoap binary not found!"
|
||||||
|
|
Loading…
Reference in New Issue