Merge branch '2.5.x' into saas

Browse source

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

...

This commit is contained in:

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

parent 80b9bcdfc6 845cabc699

commit d438587ddc

67 changed files with 31580 additions and 2925 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.mo

View file

Binary file not shown.

816

airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po

View file

File diff suppressed because it is too large Load diff