Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dual licensing: AGPL + Element Commercial #8990

Merged
merged 4 commits into from
Jan 14, 2025
Merged

Conversation

bmarty
Copy link
Member

@bmarty bmarty commented Jan 14, 2025

Content

This PR mimics what has been done on element-hq/element-x-android#4118.

Could be review commit per commit, for the big commit, this is 2 replace all, so I guess it can just be ignored...

Motivation and context

Make it clear that the code is dual licensed.

Screenshots / GIFs

There should be no impact on any code.

Tests

  • NA

Tested devices

  • NA

Checklist

  • Changes have been tested on an Android device or Android emulator with API 24
  • UI change has been tested on both light and dark themes
  • Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
  • Pull request is based on the develop branch
  • Pull request title will be used in the release note, it clearly define what will change for the user
  • Pull request includes screenshots or videos if containing UI changes
  • You've made a self review of your PR

2 replace all actions have been performed:
- "SPDX-License-Identifier: AGPL-3.0-only" to "SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial"
- "Please see LICENSE in the repository root for full details." to "Please see LICENSE files in the repository root for full details."
@bmarty bmarty merged commit 1620981 into develop Jan 14, 2025
12 of 15 checks passed
@bmarty bmarty deleted the feature/bma/licenseUpdate branch January 14, 2025 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant