Albert Santoni c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer ...

Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php

2015-01-16 17:27:52 -05:00

..

defaultdata.sql

2.5.2: Reorganize upgrade path so that 2.5.2 contains the show art schema changes

2015-01-15 12:42:36 -05:00

schema.sql

Added cc_show image_path and cc_show_instances description fields to schema

2015-01-13 17:07:23 -05:00

sequences.sql

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

sqldb.map

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

triggers.sql

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

views.sql

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00