Albert Santoni c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer ...

Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php

2015-01-16 17:27:52 -05:00

..

api_clients

Reverted commit mistakenly changing file modifiers to 755

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

icecast2

Reverted commit mistakenly changing file modifiers to 755

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

media-monitor

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

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

pypo

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

2015-01-16 17:27:52 -05:00

python-virtualenv

Reverted commit mistakenly changing file modifiers to 755

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

std_err_override

Reverted commit mistakenly changing file modifiers to 755

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