Commit 96e25766 authored by Imran Hussain's avatar Imran Hussain

Merge branch 'redesign' of projects.sucs.org:imranh/sucs-site into redesign

Conflicts:
	templates/head.tpl
	templates/index.tpl
parents da693964 255f8db3
Pipeline #215 passed with stage
in 1 minute and 28 seconds