1
0
mirror of https://github.com/Tygs/0bin.git synced 2023-08-10 21:13:00 +03:00

Merge branch 'master' of sametmax-github:sametmax/0bin

This commit is contained in:
sam 2012-05-21 13:17:16 +02:00
commit 2b35351aeb
2 changed files with 5 additions and 5 deletions

View File

@ -40,7 +40,7 @@ def index():
@app.route('/faq/') @app.route('/faq/')
@view('faq') @view('faq')
def index(): def faq():
return GLOBAL_CONTEXT return GLOBAL_CONTEXT

View File

@ -126,12 +126,12 @@
<small>Edgar Allan Poe</small> <small>Edgar Allan Poe</small>
</blockquote> </blockquote>
<!--
<h4 id="pixels-total" > <!-- <h4 id="pixels-total" >
<p>ø</p> <p>ø</p>
<strong>41,017,923,819</strong> pastes øbinned <strong>41,017,923,819</strong> pastes øbinned
</h4> </h4> -->
-->
</br> </br>
<p class="greetings span12"> <p class="greetings span12">