diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-10-20 22:34:11 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-10-20 22:34:11 +0300 |
| commit | e0ace0c722ee06f961bad6dd15abf9ba68ea540e (patch) | |
| tree | cebb7ccd24bf355a576751d71d9f8736bd72b53b /doc | |
| parent | 589a167147fd4a316f4cf588bbb2aaa103c9d3bb (diff) | |
| parent | e45b6159666b3aa271eaaa366fb4bcade2c2a28b (diff) | |
Merge branch 'master' into DRTVWR-570-maint-Q
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/contributions.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 0149dae3f2..b4469f1996 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -401,6 +401,7 @@ Cinder Roxley STORM-2127 STORM-2144 SL-3404 + SL-17634 Clara Young Coaldust Numbers VWR-1095 @@ -1122,6 +1123,7 @@ Nicky Dasmijn SL-14541 SL-16438 SL-17218 + SL-17585 Nicky Perian OPEN-1 STORM-1087 |