diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-12-15 07:06:15 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-12-15 07:06:15 +0200 |
| commit | 793bed7d06c1debb6d14b54b4f017a90c7d31feb (patch) | |
| tree | 13cff1cc02676108a047d4903c1c494eec54c1a3 /doc | |
| parent | 88921452adf528bf7aecc2d2fe893ecb5574bde0 (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
Merge branch 'main' into DRTVWR-489
# Conflicts:
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/contributions.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index e6c2e7cb70..ceb7aac600 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -242,6 +242,7 @@ Ansariel Hiller SL-19575 SL-19623 SL-4126 + SL-20224 Aralara Rajal Arare Chantilly CHUIBUG-191 @@ -931,6 +932,8 @@ LSL Scientist Lamorna Proctor Lares Carter Larry Pixel +Lars Næsbye Christensen + SL-20054 Laurent Bechir Leal Choche Lenae Munz |