Albert Santoni 8c9981a155 Merge branch '2.5.x' into 2.5.x-installer ... Conflicts: airtime_mvc/public/index.php		2015-06-16 10:37:06 -04:00
..
bin	Three bugfixes	2015-05-22 18:20:45 -04:00
install	Three bugfixes	2015-05-22 18:20:45 -04:00
liquidsoap	Fix bug where users can't connect to Master source due to hardcoded path in liquidsoap	2015-05-21 12:49:26 -04:00
pypo	Merge branch '2.5.x' into 2.5.x-installer	2015-06-16 10:37:06 -04:00
tests	CC-5990, CC-5991 - Python cleanup, removed need for /usr/lib/airtime	2015-01-27 18:43:36 -05:00
setup.py	Added missing requests dependency to pypo's requirements	2015-05-22 18:43:05 -04:00