diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-13 18:26:56 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-13 18:26:56 +0200 |
| commit | fb1238a1ce9c3e81243fca60948154c4c0d259e5 (patch) | |
| tree | c7a87acf7adbc5bd1011090a9d85160f55f2a0a1 /doc | |
| parent | c66f46121a478e0865fc9801b4d159574d65573d (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge branch 'master' into DRTVWR-516-maint
# Conflicts:
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.cpp
# indra/newview/llenvironment.cpp
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/contributions.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 07a96d8766..bbdfaf655d 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -223,6 +223,9 @@ Ansariel Hiller MAINT-8723 SL-10385 SL-10891 + SL-13364 + SL-13858 + SL-13697 Aralara Rajal Arare Chantilly CHUIBUG-191 @@ -834,7 +837,9 @@ Khyota Wulluf Kimar Coba Kithrak Kirkorian Kitty Barnett + BUG-228664 BUG-228665 + BUG-228719 VWR-19699 STORM-288 STORM-799 |