Skip to content
Snippets Groups Projects
Commit 96e25766 authored by Imran Hussain's avatar Imran Hussain
Browse files

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

Conflicts:
	templates/head.tpl
	templates/index.tpl
parents da693964 255f8db3
Pipeline #
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 15 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment