Resolve conflicts

This commit is contained in:
Abdullah Almsaeed
2017-05-18 08:11:54 -04:00
5 changed files with 66 additions and 6 deletions

View File

@@ -166,7 +166,7 @@ include "license.html"
<footer class="main-footer">
<div class="pull-right hidden-xs">
<b>Version</b> 2.4.0
<b>Version</b> 2.3.12
</div>
<strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights reserved.
</footer>