Skip to content

Commit 062a1ea

Browse files
authored
Merge pull request #2330 from bitshares/license-2021
Update license year and contributors list
2 parents c62e219 + a6c46c9 commit 062a1ea

File tree

4 files changed

+26
-7
lines changed

4 files changed

+26
-7
lines changed

.mailmap

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,31 @@
11
22
3+
Anonymous <[email protected]>
4+
5+
BrownBear <-> <->
36
Christopher Sanborn <[email protected]>
47
8+
9+
10+
511
612
713
814
15+
16+
917
Eric Frias <[email protected]>
1018
1119
1220
John M. Jones <[email protected]>
1321
1422
Matias Romeo <[email protected]>
23+
24+
1525
1626
27+
28+
1729
1830
1931
@@ -23,20 +35,26 @@ Roelandp <[email protected]>
2335
2436
2537
26-
Valentine Zavgorodnev <[email protected]>
38+
Valentine Zavgorodnev <[email protected]> <[email protected]>
39+
Valentine Zavgorodnev <[email protected]> <[email protected]>
2740
2841
2942
43+
3044
3145
3246
3347
3448
3549
50+
3651
3752
3853
54+
batmaninpink <[email protected]> <batmaninpink@>
3955
4056
4157
4258
59+
60+

CONTRIBUTORS.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ Sigve Kvalsvik <[email protected]>
2626
2727
Ryan R. Fox <[email protected]>
2828
Valentine Zavgorodnev <[email protected]>
29-
Michael Vandeberg <vandeberg@cryptonomex.com>
29+
Michael Vandeberg <[email protected].com>
3030
James Calfee <[email protected]>
3131
Alexey Frolov <[email protected]>
3232
3333
3434
Nicolas Wack <[email protected]>
3535
Taconator <[email protected]>
3636
37-
Anton Autushka <[email protected]>
37+
Anton Autushka <[email protected]>
3838
3939
4040
@@ -45,11 +45,11 @@ Tengfei Niu <[email protected]>
4545
Tiago Peralta <[email protected]>
4646
4747
Karl Semich <[email protected]>
48-
Michael Vandeberg <[email protected]>
4948
SahkanDesertHawk <[email protected]>
5049
Scott Howard <[email protected]>
5150
5251
52+
bangzi1001 <[email protected]>
5353
d.yakovitsky <[email protected]>
5454
ddylko <ddylko@ddylkoPC>
5555
iHashFury <[email protected]>
@@ -69,12 +69,13 @@ Ken Code <[email protected]>
6969
Krzysztof Szumny <[email protected]>
7070
Paul Brossier <[email protected]>
7171
72+
Semen Martynov <[email protected]>
7273
Thomas Freedman <[email protected]>
7374
Troglodactyl <[email protected]>
7475
7576
76-
bangzi1001 <[email protected]>
7777
7878
7979
8080
81+

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Copyright (c) 2015-2016 Cryptonomex Inc. <[email protected]>
2-
Copyright (c) 2015-2020 contributors, see CONTRIBUTORS.txt
2+
Copyright (c) 2015-2021 contributors, see CONTRIBUTORS.txt
33

44
The MIT License
55

libraries/fc

0 commit comments

Comments
 (0)