Merge branch 'master' from upstream.

This commit is contained in:
Bradley M. Kuhn 2015-03-07 23:08:15 -08:00
commit 2e4a50c199

View file

@ -48,7 +48,7 @@ of $<span id="fundraiser-goal">50,000</span> match met.<br/>
<li class="VMwareLawsuitFAQ"><a href="/linux-compliance/vmware-lawsuit-faq.html">
<abbr title="Frequently Asked Questions">FAQ</abbr> on VMware Lawsuit</a></li>
<li class="AboutCompliance"><a href="/linux-compliance/about.html">About GPL Compliance Project for Linux Developers</a></li>
<li class="CopyleftOrg"><a href="https://sfconservancy.org/">copyleft.org</a></li>
<li class="CopyleftOrg"><a href="https://copyleft.org/">copyleft.org</a></li>
</ul>
</div>
<div id="mainContent">{% block content %}{% endblock %}