Albert Santoni f0bad70cee Merge branch '2.5.x' into saas-pullreq77 ... Conflicts: airtime_mvc/application/Bootstrap.php airtime_mvc/application/controllers/ApiController.php		2015-01-09 13:10:54 -05:00
..
application	Merge branch '2.5.x' into saas-pullreq77	2015-01-09 13:10:54 -05:00
build	Added description field to cc_show_instances table	2014-09-19 12:56:47 -04: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	Show the plan and station URL in Live Chat	2014-12-11 17:40:34 -05:00
tests	Fixed testcases to account for show image path in and show instance description	2014-10-09 09:39:50 -04:00