Skip to content

Commit

Permalink
Merge pull request #385 from fstech/ld/update-licence
Browse files Browse the repository at this point in the history
Update LICENSE to Apache 2.0 and add copyright Zendesk
  • Loading branch information
DocX authored Apr 21, 2020
2 parents aadc751 + 5a87238 commit 5594fb1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
3 changes: 1 addition & 2 deletions LICENSE.txt → LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -187,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2014 Jerzy Chalupski
Copyright 2020 Zendesk

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
17 changes: 3 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,8 @@ Credits
=======
I used [FloatingActionButton](https://github.com/makovkastar/FloatingActionButton) library by [Oleksandr Melnykov](https://github.com/makovkastar) as a base for development.

License
=======

Copyright (C) 2014 Jerzy Chalupski

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
## Copyright and license

http://www.apache.org/licenses/LICENSE-2.0
Copyright 2020 Zendesk

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Licensed under the [Apache License, Version 2.0](LICENSE)

0 comments on commit 5594fb1

Please sign in to comment.