resolve conflict; update sponsors
authorGreg Farough <gregf@gnu.org>
Mon, 1 Mar 2021 18:06:20 +0000 (13:06 -0500)
committerGreg Farough <gregf@gnu.org>
Mon, 1 Mar 2021 18:06:20 +0000 (13:06 -0500)
commita5a602c0979af918d729ae0e6462d7cc2f364b94
treeeaafdfad9b73196aa6ddaeeab047565c9fd51669
parentf86a8115b6c239c7ee3223effd82564233bb7120
parent842ca3c71c39e888375978d2a0b5ca059aa97e02
resolve conflict; update sponsors
2021/sponsors/index.html