Merge branch 'master' into cdn-jquery

Conflicts:
	templates/todolists/view.html

2 files changed, 0 insertions, 47 deletions

diff --git a/media/arch.css b/media/arch.css
index 9b4759d3..a03d2448 100644
--- a/media/arch.css
+++ b/media/arch.css
@@ -344,53 +344,6 @@ blockquote.code {
 	padding: 5px;
 	font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", Courier, "Courier New", Monospace;
 }
-/*
- * Wiki Styles
- */
-h1.wiki {
-	border-bottom: 1px solid #46494d;
-}
-div.wikifoot_l {
-	font-size: x-small;
-	text-align: left;
-	padding-top: 25px;
-}
-div.wikifoot_r {
-	font-size: x-small;
-	text-align: right;
-	float: right;
-	padding-top: 25px;
-}
-.wikibody {
-	padding-top: 15px;
-}
-.wikibody ol {
-	padding-left: 28px;
-	padding-top: 0px;
-}
-.wikibody ul {
-	padding-left: 25px;
-	padding-top: 0px;
-}
-.wikibody dd {
-	padding-left: 30px;
-}
-.wikibody pre code {
-	background: #c1c3f6;
-	border: 1px solid #8faecd;
-	margin-left: auto;
-	margin-right: auto;
-	white-space: nowrap;
-	padding: 5px;
-	font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", Courier, "Courier New", Monospace;
-}
-.wikibody blockquote {
-	padding-left: 30px;
-}
-.wikibody td {
-	padding: 5px;
-	border: 1px solid black;
-}
 
 td.signoff_yes {
     font-size: large;
diff --git a/media/titlelogo.png b/media/titlelogo.png
index fa173795..be7f14c7 100644
--- a/media/titlelogo.png
+++ b/media/titlelogo.png