Skip to content

Commit eb39118

Browse files
authored
Merge pull request #245 from mattrubin/acknowledgements
Update the licenses in the acknowledgements file
2 parents 99e50bc + 492e1f9 commit eb39118

File tree

1 file changed

+5
-20
lines changed

1 file changed

+5
-20
lines changed

Authenticator/Resources/Acknowledgements.html

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -53,25 +53,10 @@ <h2><a href="https://github.com/mattrubin/OneTimePassword">
5353
<h2><a href="https://github.com/SVProgressHUD/SVProgressHUD">
5454
SVProgressHUD
5555
</a></h2>
56-
<p>Copyright (c) 2011-2016 Sam Vermette, Tobias Tiemerding and contributors.</p>
57-
<p>Permission is hereby granted, free of charge, to any person
58-
obtaining a copy of this software and associated documentation
59-
files (the "Software"), to deal in the Software without
60-
restriction, including without limitation the rights to use,
61-
copy, modify, merge, publish, distribute, sublicense, and/or sell
62-
copies of the Software, and to permit persons to whom the
63-
Software is furnished to do so, subject to the following
64-
conditions:</p>
65-
<p>The above copyright notice and this permission notice shall be
66-
included in all copies or substantial portions of the Software.</p>
67-
<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
68-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
69-
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
70-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
71-
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
72-
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
73-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
74-
OTHER DEALINGS IN THE SOFTWARE.</p>
56+
<p>Copyright (c) 2011-2017 Sam Vermette, Tobias Tiemerding and contributors.</p>
57+
<p>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:</p>
58+
<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
59+
<p>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.</p>
7560

7661
<h2><a href="https://github.com/jspahrsummers/xcconfigs">
7762
xcconfigs
@@ -80,6 +65,6 @@ <h2><a href="https://github.com/jspahrsummers/xcconfigs">
8065
<p>Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.</p>
8166
<p>In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.</p>
8267
<p>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 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.</p>
83-
<p>For more information, please refer to unlicense.org.</p>
68+
<p>For more information, please refer to <a href="https://unlicense.org">unlicense.org</a>.</p>
8469
</body>
8570
</html>

0 commit comments

Comments
 (0)