Commit graph

3 commits

Author SHA1 Message Date
Ghislain Seguin
7e7b1b63f1 Finished merging branch 'out-in-transition', I had trailing commas in there instead of semi-colons 2012-01-12 10:09:25 -08:00
Ghislain Seguin
9e935c31f6 Merge branch 'out-in-transition'
Conflicts:
	css/structure/index.php
	docs/_assets/js/jqm-docs.js
	index.html
2012-01-12 09:56:48 -08:00
Mat Marquis
bac53cf151 Single CSS concat file using @import, rather than the PHP concat. 2012-01-10 16:35:50 -05:00