Skip to content

Commit 5ef2c25

Browse files
committed
Merge branch 'main' into release/v10.7.0
2 parents 2bf438e + 892b034 commit 5ef2c25

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

LICENSE.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ licenses are listed here.
2626

2727

2828
## Package base
29-
[Original license reading](https://github.com/DSharpPlus/DSharpPlus/blob/master/LICENSE)
29+
[Original license reading](https://github.com/DSharpPlus/DSharpPlus/blob/547192dc580a991db52ce66bdebfacc3a701f82d/LICENSE)
30+
31+
> The following license applies to code copied from DSharpPlus up to commit [`547192d`](https://github.com/DSharpPlus/DSharpPlus/tree/547192dc580a991db52ce66bdebfacc3a701f82d).
32+
> DisCatSharp includes code originally authored by the DSharpPlus maintainers, under the MIT License as stated below.
33+
3034
```
3135
The MIT License (MIT)
3236
@@ -147,7 +151,10 @@ limitations under the License.
147151
```
148152

149153
## DisCatSharp.Common Source
150-
[Original license reading](https://github.com/Emzi0767/Common/blob/master/LICENSE.TXT)
154+
155+
This code originates from [Emzi0767's Common](https://github.com/Emzi0767/Common) at commit [`44bd7d5`](https://github.com/Emzi0767/Common/blob/44bd7d520e6929833d0c12251a1e715b8ccb90c5/LICENSE.TXT), where it was licensed under the Apache License 2.0.
156+
157+
Please note: this license was later changed to AGPL-3.0 (commit `1c693b2`) and subsequently LGPL-3.0 (commit `b7c7e48`). However, DisCatSharp.Common was derived **before** either change, and only uses code from before the license switch.
151158

152159
```
153160
Copyright 2020-2021 Emzi0767

NOTICE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
NOTICE
2+
3+
This software contains code derived from:
4+
- DSharpPlus (MIT License) at commit [`547192d`](https://github.com/DSharpPlus/DSharpPlus/tree/547192dc580a991db52ce66bdebfacc3a701f82d)
5+
- Emzi0767/Common at commit [`44bd7d5`](https://github.com/Emzi0767/Common/blob/44bd7d520e6929833d0c12251a1e715b8ccb90c5) (Apache 2.0 License)
6+
- opus (BSD-like License)
7+
- libsodium (ISC License)

0 commit comments

Comments
 (0)