diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 22:01:18 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 22:01:18 +0200 |
| commit | e70fe3a50d43bd5276f80c9f82fcfb2de02109cb (patch) | |
| tree | c35ab61e94d7b93e0e8be63f60c439d3b6a8c4b9 /doc | |
| parent | 15861d8dec096de57b0b51fa55a61a199a0f4337 (diff) | |
| parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llviewermenu.cpp
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 d3d9ef5cc7..2a77dad1fc 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -279,6 +279,7 @@ Beq Janus SL-14766 SL-14927 SL-11300 + SL-16021 Beth Walcher Bezilon Kasei Biancaluce Robbiani @@ -1107,6 +1108,7 @@ Nicky Dasmijn OPEN-187 STORM-1937 OPEN-187 + SL-15234 STORM-2010 STORM-2082 MAINT-6665 @@ -1116,6 +1118,7 @@ Nicky Dasmijn SL-11072 SL-13141 SL-13642 + SL-16438 Nicky Perian OPEN-1 STORM-1087 |