Conflicts: python_apps/pypo/airtime-liquidsoap python_apps/pypo/pypopush.py -merged RC5/final 1.8.2 to devel |
||
---|---|---|
.. | ||
api_clients | ||
media-monitor | ||
pypo | ||
show-recorder | ||
create-pypo-user.py | ||
remove-pypo-user.py |
Conflicts: python_apps/pypo/airtime-liquidsoap python_apps/pypo/pypopush.py -merged RC5/final 1.8.2 to devel |
||
---|---|---|
.. | ||
api_clients | ||
media-monitor | ||
pypo | ||
show-recorder | ||
create-pypo-user.py | ||
remove-pypo-user.py |