馃尶 home 路 馃尡 signup 路 馃尯 webterm 路 馃尫 code of conduct 路 馃尰 wiki 路 馃拹 faq
diff --git a/faq/index.html b/faq/index.html index df54a1d..ded8236 100644 --- a/faq/index.html +++ b/faq/index.html @@ -10,8 +10,8 @@
-
"frequently" asked - questions
+"frequently" asked + questions
馃尶 home 路 馃尡 signup 路 馃尯 webterm 路 馃尫 code of conduct 路 馃尰 wiki 路 馃拹 faq
diff --git a/index.php b/index.php index 04eb44e..1e12f4a 100755 --- a/index.php +++ b/index.php @@ -11,8 +11,8 @@
-
south - london
+south + london
馃尶 home 路 馃尡 signup 路 馃尯 webterm 路 馃尫 code of conduct 路 馃尰 wiki 路 馃拹 faq
diff --git a/main.css b/main.css index 278c0b9..1ff3b4a 100644 --- a/main.css +++ b/main.css @@ -104,10 +104,7 @@ code { font-family: 'Comic Mono', monospace; font-size: 14px; background-color: #e4e4e4; -<<<<<<< HEAD -======= border-radius: 4px; padding: 0 4px; ->>>>>>> 342438637f8d0d37c7b92a98868c78088d63e85e font-weight: 400; } diff --git a/signup/index.html b/signup/index.html index 879e2d6..34c371b 100644 --- a/signup/index.html +++ b/signup/index.html @@ -10,7 +10,7 @@
-
signup
+signup
馃尶 home 路 馃尡 signup 路 馃尯 webterm 路 馃尫 code of conduct 路 馃尰 wiki 路 馃拹 faq
diff --git a/wiki/html.template b/wiki/html.template index e8e78ae..2f71514 100644 --- a/wiki/html.template +++ b/wiki/html.template @@ -42,7 +42,7 @@ $include-before$ $endfor$ $if(title)$$title$
+