Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ywx649999311 patch 1 #7

Merged
merged 2 commits into from
Jan 19, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions LICENSE → LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
The MIT License (MIT)
MIT License

Copyright (c) for portions of project Vizic are held by
Copyright (c) for portions (before commit #ba739b) of project Vizic are held by
Brian E. Granger, 2014 as part of project ipyleaflet. All other copyright
for project Vizic are held by Weixiang Yu, 2016.
for project Vizic are held by Weixiang Yu, Matias Carrasco Kind and Robert J. Brunner 2016.

Copyright (c) 2014 Brian E. Granger
Copyright (c) 2016 Weixiang Yu, Matias Carrasco Kind and Robert J. Brunner

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