Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel ... Conflicts: VERSION airtime_mvc/application/models/Schedule.php airtime_mvc/application/models/Show.php airtime_mvc/public/js/airtime/dashboard/helperfunctions.js install_minimal/include/airtime-constants.php python_apps/api_clients/api_client.py python_apps/pypo/pypocli.py python_apps/pypo/pypofetch.py		2012-03-12 17:52:17 -04:00
..
helpers	CC-3334: Upgrade notification reports there is an upgrade when user has a later version than the official released version	2012-02-27 17:28:06 -05:00
scripts	CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.	2012-03-12 10:23:50 -04:00