Skip to content

Commit

Permalink
Merge pull request #284 from tox-rs/license
Browse files Browse the repository at this point in the history
Improve README + revert gpl license
  • Loading branch information
kpp authored Dec 27, 2018
2 parents 0e60820 + e886d63 commit e8c4ea4
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 5 deletions.
9 changes: 9 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## Developers

(in alphabetical order, with 10 commits or more excluding merges)

Anonymous (quininer)
Evgeny Kurnevsky (kurnevsky)
Namsoo CHO (NamsooCho)
Roman Proskuryakov (kpp)
Zetok Zalbavar (zetok)
4 changes: 0 additions & 4 deletions LICENSE-GPL
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
zerho.info
With gratitude to TOX contributors
Copyright (c) 2017 Zerho LLC

GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Expand Down
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,21 @@ consider helping :wink:
- [x] tests cover almost all functionality


## Authors

[zetox](https://github.com/zetok/tox) was created by [Zetok Zalbavar](https://github.com/zetok/)
(zetok/openmailbox/org) and assimilated by the tox-rs team.

tox-rs has contributions from many users. See [AUTHORS.md](/AUTHORS.md). Thanks everyone!

tox-rs is sponsored by [Zerho LLC](https://zerho.info/).

## License

Dual licensed under the MIT or GPLv3+ licenses. You may use this project under the
terms of either the MIT License or the GNU General Public License (GPL) Version 3+.

For details, see [LICENSE-MIT](/LICENSE) and [LICENSE-GPL](/LICENSE-GPL).
For details, see [LICENSE-MIT](/LICENSE-MIT) and [LICENSE-GPL](/LICENSE-GPL).

[Reference source repository]: https://github.com/zetok/tox-spec
[Rust]: https://www.rust-lang.org/
Expand Down

0 comments on commit e8c4ea4

Please sign in to comment.