Skip to content

Commit

Permalink
Licenses (visjs#195)
Browse files Browse the repository at this point in the history
* chore: rename license files

* chore: update license copyright

* chore: update License in README

* chore: removed the time-traveling feature
  • Loading branch information
mojoaxel authored and yotamberk committed Nov 18, 2019
1 parent cbad636 commit 870e82c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 12 deletions.
File renamed without changes.
3 changes: 2 additions & 1 deletion LICENSE-MIT → LICENSE.MIT.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
The MIT License (MIT)

Copyright (c) 2014-2017 Almende B.V.
Copyright (c) 2014-2017 Almende B.V. and contributors
Copyright (c) 2017-2019 vis.js contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
9 changes: 9 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# License

Copyright (c) 2014-2017 Almende B.V. and contributors
Copyright (c) 2017-2019 vis.js contributors

This work is dual-licensed under [Apache-2.0](./LICENSE.Apache-2.0.txt) and [MIT](./LICENSE.MIT.txt).
You can choose between one of them if you use this work.

`SPDX-License-Identifier: Apache-2.0 OR MIT`
16 changes: 5 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,10 @@ Support this project by becoming a sponsor. Your logo will show up here with a l

## License

Copyright (C) 2010-2018 Almende B.V. and Contributors
Copyright (c) 2014-2017 Almende B.V. and contributors
Copyright (c) 2017-2019 vis.js contributors

Vis.js is dual licensed under both
This work is dual-licensed under [Apache-2.0](./LICENSE.Apache-2.0.txt) and [MIT](./LICENSE.MIT.txt).
You can choose between one of them if you use this work.

* The Apache 2.0 License
http://www.apache.org/licenses/LICENSE-2.0

and

* The MIT License
http://opensource.org/licenses/MIT

Vis.js may be distributed under either license.
`SPDX-License-Identifier: Apache-2.0 OR MIT`

0 comments on commit 870e82c

Please sign in to comment.