Albert Santoni 01ea6f27ae Merge branch 'saas-dev' into saas-installer-albert ...

Conflicts:
	python_apps/api_clients/api_clients/api_client.py

2015-06-02 15:40:57 -04:00

..

media

Merge branch '2.5.x-installer' into saas-installer-albert

2015-05-22 16:05:29 -04:00

__init__.py

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

__main__.py

Merge branch '2.5.x-installer' into saas-installer-albert

2015-05-22 18:26:16 -04:00

AUTHORS

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

eventtypes.py

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

LICENSE

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

listenerstat.py

Merge branch '2.5.x-installer' into saas-installer-albert

2015-05-22 16:05:29 -04:00

pure.py

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

pypofetch.py

Merge branch 'saas-dev' into saas-installer-albert

2015-06-02 15:40:57 -04:00

pypofile.py

Merge branch 'saas-dev' into saas-installer-albert

2015-06-02 15:40:57 -04:00

pypoliqqueue.py

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

pypoliquidsoap.py

Merge branch '2.5.x-installer' into saas-installer-albert

2015-05-22 16:05:29 -04:00

pypomessagehandler.py

Three bugfixes

2015-05-22 18:20:45 -04:00

pypopush.py

Three bugfixes

2015-05-22 18:20:45 -04:00

recorder.py

Fixes for code review https://github.com/sourcefabric/Airtime/pull/84

2015-01-15 16:33:33 -05:00

telnetliquidsoap.py

Merge branch '2.5.x-installer' into saas-installer-albert

2015-05-22 16:05:29 -04:00

testpypoliqqueue.py

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

timeout.py

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00