← Back to branch summary

~bakkerl/xibo/1.6

~bakkerl/xibo/1.6

Viewing all changes in revision 312.

Committer: Dan Garner
Date: 2014-02-16 13:45:00 UTC
mfrom: (311.1.2 server-160-rc1-clockmod)
Revision ID: dan@xibo.org.uk-20140216134500-gja30qpjdjo5jyce

Merged server-160-rc1-clockmod

files added:
server/manual/content/coreconcepts/dashboard_status.png

files modified:
server/install/database/66.sql

server/install/master/data.sql

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

server/manual/content/coreconcepts/dashboard.php

server/modules/preview/HtmlTemplateForGetResource.html

Show diffs side-by-side

added added

removed removed

server/install/database/66.sql

server/install/master/data.sql

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

server/manual/content/coreconcepts/dashboard.php

server/manual/content/coreconcepts/dashboard_status.png

server/modules/preview/HtmlTemplateForGetResource.html

Older »