Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'josh' into develop

  • Loading branch information...
commit 8d1a85a8d0e542088f3cb5d87e506356f6e6a499 2 parents 6562137 + 06f048e
Kenneth Reitz kennethreitz authored

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. +2 2 LICENSE
4 LICENSE
... ... @@ -1,4 +1,4 @@
1   -Copyright (c) 2012 Kenneth Reitz.
  1 +Copyright (c) 2012 Josh Ourisman.
2 2
3 3 Permission to use, copy, modify, and/or distribute this software for any
4 4 purpose with or without fee is hereby granted, provided that the above
@@ -10,4 +10,4 @@ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
10 10 ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
11 11 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
12 12 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
13   -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  13 +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

0 comments on commit 8d1a85a

Please sign in to comment.
Something went wrong with that request. Please try again.