Conservancy/website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'rmgplus' of https://k.sfconservancy.org/website-mlinksva

Browse source
This commit is contained in:
Bradley M. Kuhn 2019-10-07 16:42:51 -07:00
commit 1bcf6f6a8e
3 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html
View file

@ -618,7 +618,7 @@ copied Christoph's code into their product.</dd>
Samba Team</a></li> Samba Team</a></li>
<li><a href="http://sourceforge.net/p/swig/news/2015/03/defending-the-gpl/">The <li><a href="http://sourceforge.net/p/swig/news/2015/03/defending-the-gpl/">The
SWIG Project</a></li> SWIG Project</a></li>
<li><a href="https://plus.google.com/104877287288155269055/posts/cHgyreA76yY">Dave Airlie, Linux Developer</a></li> <li><a href="https://web.archive.org/web/20170911061201/https://plus.google.com/104877287288155269055/posts/cHgyreA76yY">Dave Airlie, Linux Developer</a></li>
<li><a href="https://twitter.com/mjg59/status/573530001758294016">Matthew Garrett, Linux Developer</a></li> <li><a href="https://twitter.com/mjg59/status/573530001758294016">Matthew Garrett, Linux Developer</a></li>
<li><a href="/news/2015/mar/05/vmware-lawsuit/#glikely">Grant Likely, Linux Kernel Engineer</a></li> <li><a href="/news/2015/mar/05/vmware-lawsuit/#glikely">Grant Likely, Linux Kernel Engineer</a></li>
<li><a href="http://mina86.com/2015/03/11/the-time-has-come-to-stand-up-for-the-gpl/">Michal Nazarewicz, Linux Developer</a></li> <li><a href="http://mina86.com/2015/03/11/the-time-has-come-to-stand-up-for-the-gpl/">Michal Nazarewicz, Linux Developer</a></li>

1
www/conservancy/templates/base_conservancy.html
View file

@ -113,7 +113,6 @@ this_match_remaining: this_match_goal - this_match_so_far
<a href="https://mastodon.technology/@conservancy">Mastodon</a>, <a href="https://mastodon.technology/@conservancy">Mastodon</a>,
<a href="https://twitter.com/conservancy">Twitter</a>, <a href="https://twitter.com/conservancy">Twitter</a>,
<a href="https://identi.ca/conservancy">pump.io</a>, <a href="https://identi.ca/conservancy">pump.io</a>,
<a href="https://plus.google.com/104268783278405704634/">Google+</a>,
<a href="https://www.facebook.com/SoftwareFreedomConservancy/">Facebook</a>, <a href="https://www.facebook.com/SoftwareFreedomConservancy/">Facebook</a>,
and <a href="https://www.youtube.com/channel/UCUEeuNvX2UyTTyTYXR9dm_A">YouTube</a>.</p> and <a href="https://www.youtube.com/channel/UCUEeuNvX2UyTTyTYXR9dm_A">YouTube</a>.</p>

1
www/conservancy/templates/frontpage.html
View file

@ -55,7 +55,6 @@
<li class="column"><a href="https://mastodon.technology/@conservancy">Mastodon</a></li> <li class="column"><a href="https://mastodon.technology/@conservancy">Mastodon</a></li>
<li class="column"><a href="https://twitter.com/conservancy">Twitter</a></li> <li class="column"><a href="https://twitter.com/conservancy">Twitter</a></li>
<li class="column"><a href="https://identi.ca/conservancy">pump.io</a></li> <li class="column"><a href="https://identi.ca/conservancy">pump.io</a></li>
<li class="column"><a href="https://plus.google.com/104268783278405704634/">Google+</a></li>
<li class="column"><a href="https://www.facebook.com/SoftwareFreedomConservancy/">Facebook</a></li> <li class="column"><a href="https://www.facebook.com/SoftwareFreedomConservancy/">Facebook</a></li>
<li class="column"><a href="https://www.youtube.com/channel/UCUEeuNvX2UyTTyTYXR9dm_A">YouTube</a></li> <li class="column"><a href="https://www.youtube.com/channel/UCUEeuNvX2UyTTyTYXR9dm_A">YouTube</a></li>
<li class="column"><a href="/feeds/omnibus/">Full RSS feed</a></li> <li class="column"><a href="/feeds/omnibus/">Full RSS feed</a></li>