-
Richard Mansfield authored
Conflicts: htdocs/lang/en.utf8/admin.php htdocs/lang/en.utf8/mahara.php htdocs/lib/db/upgrade.php htdocs/lib/version.php htdocs/theme/raw/static/style/style.css htdocs/theme/raw/templates/microheader.tpl htdocs/theme/raw/templates/user/view.tpl htdocs/theme/raw/templates/view/blocks.tpl htdocs/theme/raw/templates/view/view.tpl htdocs/theme/raw/templates/viewmicroheader.tpl htdocs/theme/views.css htdocs/view/blocks.php htdocs/view/view.php
e0a037c3