diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-11 22:54:23 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-11 22:54:23 +0200 |
| commit | d6480e2b7f38facd27bf90376aca1c2b3832fa55 (patch) | |
| tree | bd8bd223515cd4ecf74d1efca404af793825f2f2 /doc | |
| parent | 11a9332fa7bd830d8e44f15a91e008f3a6f9c19d (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelavatar.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 df51b5b042..5a389e30cd 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -224,6 +224,9 @@ Ansariel Hiller SL-10385 SL-10891 SL-10675 + SL-13364 + SL-13858 + SL-13697 Aralara Rajal Arare Chantilly CHUIBUG-191 @@ -836,7 +839,9 @@ Khyota Wulluf Kimar Coba Kithrak Kirkorian Kitty Barnett + BUG-228664 BUG-228665 + BUG-228719 VWR-19699 STORM-288 STORM-799 |