Merge remote-tracking branch 'origin/master'

yodasan · yodasan · commit a0023c099531 · 2013-08-12T13:10:03.000-07:00
diff --git a/templates/container.html b/templates/container.html
@@ -1 +1 @@
-<header></header><div id="sm-container"></div><footer></footer>
+<header></header><div id="sm-container"></div><div id="sm-pages"></div><footer></footer>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<header></header><div id="sm-container"></div><footer></footer>`
	`1`	`+<header></header><div id="sm-container"></div><div id="sm-pages"></div><footer></footer>`