GIT: Resolved conflict on merge from upstream

This commit is contained in:
Andrew Heather
2015-12-22 16:49:44 +00:00
381 changed files with 10834 additions and 2450 deletions

View File

@ -3,7 +3,7 @@
<div class="footer">
<p>
Copyright&nbsp;&copy;&nbsp;2011-2013&nbsp;
<a href="http://www.openfoam.org/about">OpenFOAM Foundation</a>
<a href="http://www.openfoam.com/about">OpenFOAM</a>
|
OPENFOAM&reg; is a registered
<a href="http://www.openfoam.com/legal/trademark-policy.php">trademarks