Albert Santoni d5b969f94f Merge branch '2.5.x' into saas ... Conflicts: airtime_mvc/application/forms/GeneralPreferences.php airtime_mvc/application/views/scripts/form/preferences_general.phtml airtime_mvc/application/views/scripts/form/support-setting.phtml		2015-01-13 21:31:57 -05:00
..
application	Merge branch '2.5.x' into saas	2015-01-13 21:31:57 -05:00
build	Added cc_show image_path and cc_show_instances description fields to schema	2015-01-13 17:07:23 -05:00
library	Remove swear words from source code	2013-09-23 16:16:51 +01:00
locale	Merge branch '2.5.x' into saas	2015-01-07 12:37:26 -05:00
public	Merge branch '2.5.x' into saas	2015-01-13 21:31:57 -05:00
tests	Fixed testcases to account for show image path in and show instance description	2014-10-09 09:39:50 -04:00