Merge branch 'dev'

ntd · Dec 18, 2015 · 1fa615f · 1fa615f
2 parents adede1c + 8725411
commit 1fa615f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/templates/Includes/ContentBody.ss b/templates/Includes/ContentBody.ss
@@ -6,5 +6,5 @@
 	<main class="typography <% if $Autotoc %>col-xs-12 col-sm-12 col-md-9<% else %>col-md-12<% end_if %>" id="ss-content">
 		$Content
 	</main>
-	$Form
 </div>
+$Form
diff --git a/templates/Includes/Favicon.ss b/templates/Includes/Favicon.ss
@@ -1 +1 @@
-<link rel="shortcut icon" href="/favicon.ico">
+<link rel="shortcut icon" href="favicon.ico">
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,5 +6,5 @@ @@
     	<main class="typography <% if $Autotoc %>col-xs-12 col-sm-12 col-md-9<% else %>col-md-12<% end_if %>" id="ss-content">
     		$Content
     	</main>
-    	$Form
     </div>
+    $Form
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<link rel="shortcut icon" href="/favicon.ico">
		<link rel="shortcut icon" href="favicon.ico">