-
Richard Mansfield authored
Conflicts: htdocs/admin/site/options.php htdocs/lang/en.utf8/admin.php htdocs/lib/db/upgrade.php htdocs/lib/version.php htdocs/view/artefact.php htdocs/view/view.php
042a900b
Conflicts: htdocs/admin/site/options.php htdocs/lang/en.utf8/admin.php htdocs/lib/db/upgrade.php htdocs/lib/version.php htdocs/view/artefact.php htdocs/view/view.php