From: Dylan Lloyd <dylan@dylansserver.com>
Date: Mon, 30 Jan 2012 03:31:04 +0000 (-0500)
Subject: Merge branch 'dev' into live
X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=7a9f49a1c4205a2f44bebe930b3e3f75a23d9261;hp=bb1eebf30f1917d091f84a9bd43b97a5e3fcf574;p=dylansserver.git

Merge branch 'dev' into live
---

diff --git a/404.php b/404.php
index 19e46aa..4d293c7 100644
--- a/404.php
+++ b/404.php
@@ -55,7 +55,7 @@
     "font-size:20em;font-family:'MuseoSlab500';">sorry</span><br>
     <br>
     <span style="font-size:3em;font-family:'InconsolataMedium'">can't find that. maybe try
-    <a href="http://dylanstestserver.com">here</a>?</span><br>
+    <a href="http://dylansserver.com">here</a>?</span><br>
   </div>
 </body>
 </html>