Skip to content

Commit

Permalink
adjust cla config
Browse files Browse the repository at this point in the history
  • Loading branch information
solverat committed Nov 14, 2024
1 parent 48c19fa commit f3dae55
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CLA.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ such litigation is filed.

## 3. Source of Contribution.
Your contribution is either your original creation, based upon previous work that, to the best of your knowledge, is
covered under an appropriate open source license and you have the right under that license to submit that work with
covered under an appropriate open source license, and you have the right under that license to submit that work with
modifications, whether created in whole or in part by you, or you have clearly identified the source of the contribution
and any license or other restriction (like related patents, trademarks, and license agreements) of which you are
personally aware.
20 changes: 6 additions & 14 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
# License
Copyright (C) DACHCOM.DIGITAL
Copyright (C) 2023 DACHCOM.DIGITAL

This software is available under two different licenses:
* GNU General Public License version 3 (GPLv3) as Pimcore Community Edition
* DACHCOM Commercial License (DCL)
This software is available under the GNU General Public License version 3 (GPLv3).

The default FormBuilder license, without a valid DACHCOM Commercial License agreement, is the Open-Source GPLv3 license.

## GNU General Public License version 3 (GPLv3)
If you decide to choose the GPLv3 license, you must comply with the following terms:
### GNU General Public License version 3 (GPLv3)
If you decide to choose the GPLv3 license, you must comply with the following terms:

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -17,14 +13,10 @@ the Free Software Foundation, either version 3 of the License, or

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

## DACHCOM Commercial License (DCL)
Alternatively, commercial and supported versions of the program - also known as
Commercial Distributions - must be used in accordance with the terms and conditions
contained in a separate written agreement between you and DACHCOM.DIGITAL AG.
For more information about the FormBuilder Commercial License (DCL) please contact [email protected].
[GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.en.html)

0 comments on commit f3dae55

Please sign in to comment.