Skip to content

Commit

Permalink
#427 Updated readme and license
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexTr committed Sep 27, 2016
1 parent 751e0f8 commit ab7ee29
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 15 deletions.
12 changes: 6 additions & 6 deletions README.md
@@ -1,14 +1,14 @@
#[Trident](http://www.online.me)
#[UNA](https://una.io)

Community software platform
Community Management System

##License

Trident is licensed under the Creative Commons Public License, see license.txt for full details.
UNA is licensed under the MIT License, see license.txt for full details.

##Help

- [Wiki](https://github.com/boonex/trident/wiki)
- [Wiki](https://github.com/unaio/una/wiki)
- [Auto generated documentation](http://ci.boonex.com/docs)
- [Forum](http://www.boonex.com/forums)
- [Contact us](http://www.boonex.com/help/contact)
- [Forum](https://una.io/page/discussions-home)
- [Contact us](https://una.io/page/contact)
14 changes: 5 additions & 9 deletions license.txt
@@ -1,13 +1,9 @@
Copyright © 2015 Boonex Pty Ltd
The MIT License (MIT)

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:
Copyright (c) 2016 UNA, Inc

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
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:

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 ab7ee29

Please sign in to comment.