gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-23 01:22:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3122 from chadwhitacre/fsl-1.1

Browse Source 
Upgrade FSL to 1.1
This commit is contained in:
Scott Chacon 2024-03-12 15:14:36 +01:00 committed by GitHub
commit 95fdf64db8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
LICENSE.md
View File

@ -1,12 +1,12 @@
# Functional Source License, Version 1.0, MIT Change License # Functional Source License, Version 1.1, MIT Future License
## Abbreviation ## Abbreviation
FSL-1.0-MIT FSL-1.1-MIT
## Notice ## Notice
Copyright 2024 GitButler Inc Copyright 2023-2024 GitButler Inc
## Terms and Conditions ## Terms and Conditions
@ -30,18 +30,15 @@ and redistribute the Software for any Permitted Purpose identified below.
### Permitted Purpose ### Permitted Purpose
A Permitted Purpose is any purpose other than a Competing Use. A Competing Use A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
means use of the Software in or for a commercial product or service that means making the Software available to others in a commercial product or
competes with the Software or any other product or service we offer using the service that:
Software as of the date we make the Software available.
Competing Uses specifically include using the Software: 1. substitutes for the Software;
1. as a substitute for any of our products or services; 2. substitutes for any other product or service we offer using the Software
that exists as of the date we make the Software available; or
2. in a way that exposes the APIs of the Software; and 3. offers the same or substantially similar functionality as the Software.
3. in a product or service that offers the same or substantially similar
functionality to the Software.
Permitted Purposes specifically include using the Software: Permitted Purposes specifically include using the Software:
@ -51,9 +48,8 @@ Permitted Purposes specifically include using the Software:
3. for non-commercial research; and 3. for non-commercial research; and
4. in connection with software development services or managed services that 4. in connection with professional services that you provide to a licensee
you provide to a licensee using the Software in accordance with these Terms using the Software in accordance with these Terms and Conditions.
and Conditions.
### Patents ### Patents
@ -88,12 +84,12 @@ Except for displaying the License Details and identifying us as the origin of
the Software, you have no right under these Terms and Conditions to use our the Software, you have no right under these Terms and Conditions to use our
trademarks, trade names, service marks or product names. trademarks, trade names, service marks or product names.
## Change License ## Grant of Future License
On the second anniversary of the date we make the Software available, the We hereby irrevocably grant you an additional license to use the Software under
Software will become available under the MIT license. On that date, the Terms the MIT license that is effective on the second anniversary of the date we make
and Conditions above automatically terminate and the following terms become the Software available. On or after that date, you may use the Software under
effective: the MIT license, in which case the following will apply:
Permission is hereby granted, free of charge, to any person obtaining a copy of 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 this software and associated documentation files (the "Software"), to deal in