Albert Santoni d438587ddc Merge branch '2.5.x' into saas ...

Conflicts:
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/airtime/CcShow.php
	airtime_mvc/application/services/SchedulerService.php
	airtime_mvc/application/services/ShowService.php

2014-08-25 18:09:51 -04:00

..

application

Merge branch '2.5.x' into saas

2014-08-25 18:09:51 -04:00

build

Merge branch '2.5.x' into cc-5709-airtime-analyzer

2014-04-23 15:58:39 -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

2014-08-25 18:09:51 -04:00

public

Removed unused code.

2014-08-21 17:12:54 -04:00

tests

Removed database test that confirms the is_linkable is set to false after a show is un-linked.

2014-08-21 17:56:00 -04:00