Skip to content

Commit

Permalink
Merge pull request #2330 from bitshares/license-2021
Browse files Browse the repository at this point in the history
Update license year and contributors list
  • Loading branch information
abitmore authored Jan 10, 2021
2 parents c62e219 + a6c46c9 commit 062a1ea
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 7 deletions.
20 changes: 19 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@
Alfredo Garcia <[email protected]> <[email protected]>
Alfredo Garcia <[email protected]> <[email protected]>
Anonymous <[email protected]>
Anton Autushka <[email protected]> <[email protected]>
BrownBear <-> <->
Christopher Sanborn <[email protected]>
Chronos <[email protected]>
Dan Notestein <[email protected]> <[email protected]>
Dan Notestein <[email protected]> <[email protected]>
Daniel Larimer <[email protected]> <[email protected]>
Daniel Larimer <[email protected]> <[email protected]>
Daniel Larimer <[email protected]> <[email protected]>
Daniel Larimer <[email protected]> <[email protected]>
Daniel Larimer <[email protected]> <[email protected]>
Daniel Larimer <[email protected]> <[email protected]>
Daniel Larimer <[email protected]> <[email protected]>
Eric Frias <[email protected]>
Fabian Schuh <[email protected]> <[email protected]>
Fabian Schuh <[email protected]> <[email protected]>
John M. Jones <[email protected]>
Ken Code <[email protected]>
Matias Romeo <[email protected]>
Michael Vandeberg <[email protected]> <[email protected]>
Michael Vandeberg <[email protected]> <[email protected]>
Nathan Hourt <[email protected]> <[email protected]>
Nathan Hourt <[email protected]> <[email protected]>
Nathan Hourt <[email protected]> <[email protected]>
Nikolai Mushegian <[email protected]> <[email protected]>
OpenLedger <[email protected]> <[email protected]>
OpenLedger <[email protected]> <[email protected]>
Peter Conrad <[email protected]> <[email protected]>
Expand All @@ -23,20 +35,26 @@ Roelandp <[email protected]>
Ryan R. Fox <[email protected]> <[email protected]>
Ryan R. Fox <[email protected]> <[email protected]>
Sigve Kvalsvik <[email protected]> <[email protected]>
Valentine Zavgorodnev <[email protected]>
Valentine Zavgorodnev <[email protected]> <[email protected]>
Valentine Zavgorodnev <[email protected]> <[email protected]>
Valera Cogut <[email protected]> <[email protected]>
Vikram Rajkumar <[email protected]> <[email protected]>
Vikram Rajkumar <[email protected]> <[email protected]>
Vikram Rajkumar <[email protected]> <[email protected]>
William <[email protected]> <[email protected]>
William <[email protected]> <[email protected]>
Xiaodong Li <[email protected]> <[email protected]>
Xiaodong Li <[email protected]> <[email protected]>
Xiaodong Li <[email protected]> <[email protected]>
Xiaodong Li <[email protected]> <[email protected]>
Yuvaraj Gogoi <[email protected]> <[email protected]>
abitmore <[email protected]>
albert <[email protected]> <[email protected]>
albert <[email protected]> <[email protected]>
batmaninpink <[email protected]> <batmaninpink@>
bitcube <[email protected]>
btcinshares <[email protected]> <[email protected]>
crazybits <[email protected]> <[email protected]>
crazybits <[email protected]> <[email protected]>
theoreticalbts <[email protected]> <[email protected]>
theoreticalbts <[email protected]> <[email protected]>
9 changes: 5 additions & 4 deletions CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ Sigve Kvalsvik <[email protected]>
albert <[email protected]>
Ryan R. Fox <[email protected]>
Valentine Zavgorodnev <[email protected]>
Michael Vandeberg <vandeberg@cryptonomex.com>
Michael Vandeberg <[email protected].com>
James Calfee <[email protected]>
Alexey Frolov <[email protected]>
syalon <[email protected]>
takaaki7 <[email protected]>
Nicolas Wack <[email protected]>
Taconator <[email protected]>
Qi Xing <[email protected]>
Anton Autushka <[email protected]>
Anton Autushka <[email protected]>
Chronos <[email protected]>
Wei Yang <[email protected]>
Zapata <[email protected]>
Expand All @@ -45,11 +45,11 @@ Tengfei Niu <[email protected]>
Tiago Peralta <[email protected]>
ioBanker <[email protected]>
Karl Semich <[email protected]>
Michael Vandeberg <[email protected]>
SahkanDesertHawk <[email protected]>
Scott Howard <[email protected]>
Tydus <[email protected]>
William <[email protected]>
bangzi1001 <[email protected]>
d.yakovitsky <[email protected]>
ddylko <ddylko@ddylkoPC>
iHashFury <[email protected]>
Expand All @@ -69,12 +69,13 @@ Ken Code <[email protected]>
Krzysztof Szumny <[email protected]>
Paul Brossier <[email protected]>
Roelandp <[email protected]>
Semen Martynov <[email protected]>
Thomas Freedman <[email protected]>
Troglodactyl <[email protected]>
VoR0220 <[email protected]>
alt <[email protected]>
bangzi1001 <[email protected]>
bitcube <[email protected]>
lafona <[email protected]>
liondani <[email protected]>
lososeg <[email protected]>
xiao93 <[email protected]>
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (c) 2015-2016 Cryptonomex Inc. <[email protected]>
Copyright (c) 2015-2020 contributors, see CONTRIBUTORS.txt
Copyright (c) 2015-2021 contributors, see CONTRIBUTORS.txt

The MIT License

Expand Down
2 changes: 1 addition & 1 deletion libraries/fc
Submodule fc updated 3 files
+60 −0 .mailmap
+53 −0 CONTRIBUTORS.txt
+3 −2 LICENSE.md

0 comments on commit 062a1ea

Please sign in to comment.