Merge branch 'airtime-1.6.1'

Conflicts:
	CREDITS
	application/views/scripts/login/index.phtml
This commit is contained in:
martin 2011-03-01 11:38:01 -05:00
commit 2e14bcc9ff
1 changed files with 3 additions and 3 deletions

View File

@ -4,8 +4,8 @@ CREDITS
Version 1.6.1
-------------
This version fixes an issue with playback problems after 48 hours into a
schedule, as well as some security fixes.
Version 1.6.1 fixes a problem with playout being interrupted after 48
hours. It also fixes some security issues.
Version 1.6.0
-------------