zec
/
zcash-test-vectors
mirror of https://github.com/zcash/zcash-test-vectors.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60 from daira/license-contribution-text 

Revert a change made in #53, so that the license and contribution preamble is visible in `README.md`
This commit is contained in:
str4d 2022-01-07 15:04:44 +00:00 committed by GitHub
parent 6ee8ff7f51 2bff061a7b
commit 290218811f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE-MIT
View File

@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2018-2019 Electric Coin Company
Copyright (c) 2018-2021 The Electric Coin Company
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

14
README.md
View File

@ -9,4 +9,16 @@ Requirements:
## License
This repository is [MIT/Apache 2.0 dual-licensed](COPYING.md).
Licensed under either of
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
at your option.
### Contribution
Unless you explicitly state otherwise, any contribution intentionally
submitted for inclusion in the work by you, as defined in the Apache-2.0
license, shall be dual licensed as above, without any additional terms or
conditions.