Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts: .zfproject.xml application/configs/airtime-conf.php build/build.properties public/css/styles.css
This commit is contained in:
commit
50054befd6
18 changed files with 309 additions and 115 deletions
|
@ -206,7 +206,7 @@ CREATE TABLE "cc_show_days"
|
|||
"last_show" DATE,
|
||||
"start_time" TIME NOT NULL,
|
||||
"duration" TIME NOT NULL,
|
||||
"day" INT2 NOT NULL,
|
||||
"day" INT2,
|
||||
"repeat_type" INT2 NOT NULL,
|
||||
"next_pop_date" DATE,
|
||||
"show_id" INTEGER NOT NULL,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue