Permalink
Browse files

Merge branches 'dev' and 'master'

  • Loading branch information...
2 parents 3f7a007 + fe7cb6b commit 0061d02a919ee16099fde554b2078c633fad650b nemesisdesign committed Sep 9, 2012
Showing with 4 additions and 4 deletions.
  1. +2 −2 nodeshot/templates/404.html
  2. +2 −2 nodeshot/templates/500.html
@@ -19,9 +19,9 @@
<div id="container">
<h1>{% trans '..Ops! 404 Page not found' %}</h1>
<p>{% trans 'The page you were looking for was not found on this website.' %}</p>
- <p style="text-align:center;margin: 40px 0 30px"><img src="{{ MEDIA_URL }}/images/404.png" alt="404" /></p>
+ <p style="text-align:center;margin: 40px 0 30px"><img src="{{ MEDIA_URL }}images/404.png" alt="404" /></p>
<p class="goback"><a href="{% url nodeshot.views.index %}">{% trans "Go back to the homepage" %}</a></p>
</div>
<p class="credits">Illustration by <a href="http://theoatmeal.com/" target="_blank">The Oatmeal</a></p>
</body>
-</html>
+</html>
@@ -21,9 +21,9 @@
<p>{% trans "We'are <strong>experiencing technical problems</strong>, probably we are working on the website for mantainance or an unplanned event has happened." %}</p>
<p>{% trans "We apologize for the inconvenient, we are working to fix this problem as soon as possible." %}</p>
<p>{% trans "If this problem persists, please contact the administrators of this server." %}</p>
- <p style="text-align:center;margin-top: 40px"><img src="{{ MEDIA_URL }}/images/500.png" alt="" /></p>
+ <p style="text-align:center;margin-top: 40px"><img src="{{ MEDIA_URL }}images/500.png" alt="" /></p>
<p class="goback"><a href="{% url nodeshot.views.index %}">{% trans "Go back to the homepage" %}</a></p>
</div>
<p class="credits">Illustration by <a href="http://theoatmeal.com/" target="_blank">The Oatmeal</a></p>
</body>
-</html>
+</html>

0 comments on commit 0061d02

Please sign in to comment.