← Back to branch summary

~dangarner/xibo/server162-testfix

~dangarner/xibo/server162-testfix

Viewing all changes in revision 325.

Committer: Dan Garner
Date: 2014-04-29 15:50:10 UTC
mfrom: (323.1.5 server-160)
Revision ID: dan@xibo.org.uk-20140429155010-c20zcdpiqjbt6npa

Merged latest CMS and Manual

files added:
server/install/database/68.sql

server/manual/content/admin/release_notes_1.6.0.php

files modified:
server/install/master/data.sql

server/lib/data/displaygroup.data.class.php

server/lib/data/region.data.class.php

server/lib/include.php

server/lib/modules/module.class.php

server/manual/content/routes.php

server/manual/content/toc_developer_releasenotes.php

server/theme/default/libraries/bootstrap/js/bootstrap-ckeditor-fix.js

Show diffs side-by-side

added added

removed removed

server/install/database/68.sql

server/install/master/data.sql

server/lib/data/displaygroup.data.class.php

server/lib/data/region.data.class.php

server/lib/include.php

server/lib/modules/module.class.php

server/manual/content/admin/release_notes_1.6.0.php

server/manual/content/routes.php

server/manual/content/toc_developer_releasenotes.php

server/theme/default/libraries/bootstrap/js/bootstrap-ckeditor-fix.js

Older »