Merge branch 'master' of github.com:status-im/nim-libp2p

This commit is contained in:
cheatfate 2019-01-09 19:12:48 +02:00
commit 70bdf624be
1 changed files with 4 additions and 1 deletions

View File

@ -9,6 +9,9 @@ libp2p implementation in Nim
Licensed and distributed under either of Licensed and distributed under either of
* MIT license: [LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT * MIT license: [LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
or
* Apache License, Version 2.0, ([LICENSE-APACHEv2](LICENSE-APACHEv2) or http://www.apache.org/licenses/LICENSE-2.0)
at your option. This file may not be copied, modified, or distributed except according to those terms. at your option. This file may not be copied, modified, or distributed except according to those terms.