Merge remote-tracking branch 'upstream/master' into vichan-merge

This commit is contained in:
Simon McFarlane 2015-05-26 23:31:47 -07:00
commit 4b40f69a4e
223 changed files with 65256 additions and 2969 deletions

View file

@ -48,12 +48,12 @@
<footer>
{% include 'badges.html' %}
<p class="unimportant" style="margin-top:20px;text-align:center;">
- <a href="http://tinyboard.org/">Tinyboard</a> + <a href="https://int.vichan.net/devel/">vichan</a> + <a href="https://github.com/lainchan/lainchan">lainchan</a> {{ config.version }} -<br>
<a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group<br/>
<a href="https://int.vichan.net/devel/">vichan</a> Copyright &copy; 2012-2014 vichan-devel<br/>
<a href="https://github.com/lainchan/lainchan">lainchan</a> Copyright &copy; 2014-2015 lainchan Administration
</p>
<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> +
<a href='https://int.vichan.net/devel/'>vichan</a> +
<a href='https://github.com/lainchan/lainchan'>lainchan</a> {{ config.version }} -
<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group
<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel
<br><a href="https://github.com/lainchan/lainchan">lainchan</a> Copyright &copy; 2014-2015 lainchan Administration</p>
{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
</footer>
<div class="bar bottom">