Li-Wen Yip b9d04230d9 Merge remote-tracking branch 'refs/remotes/halogenica/master' ... # Conflicts: # layouts/index.html		2017-03-08 20:31:31 +00:00
..
_default	Resolve conflicts with remote-tracking branch 'refs/remotes/halogenica/master'	2017-03-08 19:03:10 +00:00
partials	Resolve conflicts with remote-tracking branch 'refs/remotes/halogenica/master'	2017-03-08 19:03:10 +00:00
404.html	Correct spacing and remove extraneous </div>	2017-03-06 13:36:42 -08:00
index.html	Resolve conflicts with remote-tracking branch 'refs/remotes/halogenica/master'	2017-03-08 19:03:10 +00:00