Skip to content

Commit

Permalink
switch to ISC license.
Browse files Browse the repository at this point in the history
  • Loading branch information
bcoe committed Jan 29, 2015
1 parent 325055f commit 6e38be2
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 19 deletions.
30 changes: 12 additions & 18 deletions LICENSE.txt
@@ -1,20 +1,14 @@
Copyright (c) 2011 Attachments.me
Copyright (c) 2014, 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 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:
Permission to use, copy, modify, and/or distribute this software
for any purpose with or without fee is hereby granted, provided
that the above copyright notice and this permission notice
appear in all copies.

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.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE
LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
7 changes: 6 additions & 1 deletion README.markdown
Expand Up @@ -42,7 +42,7 @@ Any named groups specified in the route regex will be availble as instance varia

```python
class ExampleRoute(Route):

@route(r'(?P<prefix>open)@(?P<suffix>.*)')
def open_route(self):
print "%s at %s sent the message: \n\n %s" % (
Expand Down Expand Up @@ -141,3 +141,8 @@ Additional Support for Attachments
* _attachment.data_ the binary data of the attachment.
* _attachment.extension_ the file extension of the attachment.
* _attachment.mime_type_ the mime type of the attachment.

License
-------

ISC, see LICENSE.txt

0 comments on commit 6e38be2

Please sign in to comment.