Skip to content

Commit

Permalink
Update license
Browse files Browse the repository at this point in the history
Change-Id: Ie8879c3ff32ec7cb120f320defe7b37e0ca6695d
  • Loading branch information
Coraline Ada Ehmke committed Mar 11, 2015
1 parent f75b145 commit f8805e6
Showing 1 changed file with 19 additions and 12 deletions.
31 changes: 19 additions & 12 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
Copyright (c) 2014 Coraline Ada Ehmke / Instructure.inc
Copyright (c) 2014 Coraline Ada Ehmke

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
MIT License

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

You should have received a copy of the GNU General Public License
along with this program in the file COPYING.txt. If not, see
<http://www.gnu.org/licenses/>
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 comments on commit f8805e6

Please sign in to comment.