Skip to content

Commit

Permalink
Add MemorizingTrustManager to Infopage
Browse files Browse the repository at this point in the history
  • Loading branch information
Felix Bürkle committed Mar 4, 2016
1 parent 7de0039 commit 98c9501
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
21 changes: 21 additions & 0 deletions src/main/assets/MTM-LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT license.

Copyright (c) 2010 Georg Lukas <[email protected]>

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.
3 changes: 3 additions & 0 deletions src/main/assets/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ <h2>Jackson Core <a href="https://github.com/FasterXML/jackson-core">[Link]</a><
<h2>GraphView for Android <a href="https://github.com/jjoe64/GraphView">[Link]</a></h2>
licensed under <a href="gplv2_with_linkingexception.txt">GPLv2 including "GPL linking exception"</a>

<h2>MemorizingTrustManager <a href="https://github.com/ge0rg/MemorizingTrustManager">[Link]</a></h2>
licensed under <a href="MTM-LICENSE.txt">MIT License</a>

<h2>Pubnub <a href="http://www.pubnub.com/">[Link]</a></h2>
<a href="pubnub_license.html">MIT License</a>

Expand Down

0 comments on commit 98c9501

Please sign in to comment.