Merge remote-tracking branch 'ruddfawcett/master' into develop

2013-02-27 22:36:13 -05:00
parent bc46b9159a 48fdcc9edb
commit 76d84a392e
248 changed files with 15 additions and 59 deletions
@@ -35,7 +35,7 @@
 <body>
    <div class='container'>
        <div class='marketing'>
-            <img class='rotate-img' src="/img/sprites/armor3_m.png" />
+            <img class='rotate-img' src="/img/BrowserQuest/habitrpg_mods/armor3_m.png" />
            <h2>The server is experiencing issues.</h2>
            <p><a href="/">Try again</a> in a few, the developer has been notified. The most likely culprit is <a href="https://github.com/lefnire/habitrpg/issues/165">this issue</a> which Tyler is working frantically to fix. (Any memory leak experts?)</p>
        </div>
--- a/Show More
+++ b/Show More