Manual merge of ungleich/master into opennebula-integration

This commit is contained in:
M.Ravi 2017-04-24 03:01:05 +05:30
commit d537fcb118
227 changed files with 25682 additions and 478 deletions

View file

@ -31,8 +31,8 @@
</a>
</li>
</ul>
<p class="copyright text-muted text-centered">
{% static_placeholder "footer_copyright" %}
<p class="copyright">
Copyright © ungleich GmbH {% now "Y" %}
</p>
</div>
</div>