moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change To Font Lato in VM Pages and remove messages in login

Browse source
This commit is contained in:
Henry Bravo 2017-06-11 19:46:07 -05:00
commit 225f92caf5
24 changed files with 0 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hosting/templates/hosting/base_short.html
View file

@ -130,15 +130,7 @@
{% if request.user.is_authenticated %}
<footer class="footer-vm">
<div class="container">
<<<<<<< HEAD
<div class="row">
<div class="col-lg-12">
<p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
</div>
</div>
=======
<p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
>>>>>>> 7b197ec75bb8eecd239988ac929315b50c50d233
</div>
</footer>
{% endif %}