Commit Graph

2 Commits

Author SHA1 Message Date
Michael Foster
1ffabe2b93 fix header.html merge 2013-07-31 03:55:55 -04:00
asiekierka
a9f3f44c5f refactored head away from templates
Conflicts:
	templates/generic_page.html
	templates/index.html
	templates/page.html
2013-07-31 03:54:18 -04:00