Skip to content

Commit

Permalink
Merge pull request #1 from minrk/update-license
Browse files Browse the repository at this point in the history
update license to Jupyter
  • Loading branch information
willingc committed Apr 19, 2016
2 parents 362f4d1 + 7e20ec6 commit 686b099
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2015, calpolydatascience
Copyright (c) 2015, Jupyter Development Team, Cal Poly
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand All @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of jupyterhub-deploy-data301 nor the names of its
* Neither the name of Jupyter Development Team nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

Expand Down

0 comments on commit 686b099

Please sign in to comment.