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
..
bin	Fix a bad reversion in the airtime-playout binary	2015-01-15 10:12:52 -05:00
install	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
setup.py	Fixes to install & uninstall procedure	2015-01-15 17:33:47 -05:00