diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-15 20:55:02 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-15 21:36:58 +0200 |
| commit | 2800905ac354fec6316cf83da85eb5f4c6060741 (patch) | |
| tree | 56ca4cb7d8de5ce698a164bb869812c16164c21a /doc/contributions.txt | |
| parent | 6583fdf526c356b47122de3894b0fb68d83ae50b (diff) | |
| parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) | |
Merge branch master (DRTVWR-552) into DRTVWR-542-meshopt
+resolved viewer-manager's inherited conflict
Diffstat (limited to 'doc/contributions.txt')
| -rwxr-xr-x | doc/contributions.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index cc68162c2d..e029c29a18 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -226,8 +226,15 @@ Ansariel Hiller SL-13364 SL-13858 SL-13697 + SL-14939 + SL-14940 + SL-14941 SL-13395 SL-3136 + SL-15200 + SL-15226 + SL-15227 + SL-15398 Aralara Rajal Arare Chantilly CHUIBUG-191 |