This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merge branch 'master' into v3.0.1-features

Conflicts:
	views/index.html
  • Loading branch information...
hako committed Oct 27, 2015
2 parents 69e6ca9 + f8e2667 commit db8ce9ac8a24d97d05c3f74c470b547e5a2246c1
Showing with 1 addition and 1 deletion.
  1. +1 −1 views/index.html
View
@@ -290,4 +290,4 @@ <h6 class="black">&copy; {{ year }}</h6>
</div>
</footer>
<!-- End Footer -->
{% endblock %}
{% endblock %}

0 comments on commit db8ce9a

Please sign in to comment.