diff --git a/LICENSE b/LICENSE index 4140ce27296a77503946bb76ad527b8dda6d6d2f..a13b2b0714e0b3190918c968e4e5b63c9690e7fc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,15 +1,21 @@ +MIT License -Copyright 2019 Felix Schäfer, Dominik Weitz +Copyright (c) 2019 Felix Schäfer, Dominik Weitz -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 +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: - http://www.apache.org/licenses/LICENSE-2.0 - -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. +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. diff --git a/README.rst b/README.rst index 0afaa9498303d16aec0468c8621485455fd99606..1d721f0ed4cf50d5cbb7e8eea5f8d354d2230d97 100644 --- a/README.rst +++ b/README.rst @@ -26,7 +26,7 @@ License Copyright 2019 Felix Schäfer, Dominik Weitz -Released under the terms of the Apache License 2.0 +Released under the terms of the MIT License diff --git a/setup.py b/setup.py index 292df3967fd22a6790ad7eba3fbe7a76a6e66cc2..28c652a0c2c9d446825b216f9775b593de42e2e7 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ setup( url='git@gitlab.fachschaften.org:kifev/pretix-public-registrations.git', author='Felix Schäfer, Dominik Weitz', author_email='admin@kif.rocks', - license='Apache Software License', + license='MIT License', install_requires=['django-gravatar2'], packages=find_packages(exclude=['tests', 'tests.*']),