summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-11-11 23:34:37 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-11-11 23:34:37 +0200
commit92af5af736c2d6f3ac2f3ae5539da4bdea22e2a5 (patch)
tree888a19c6343d37ff1fc8fd22362799c143671a93 /doc
parentb1f84f13a8a1d0404e4593ac413b66af8d135f40 (diff)
parent04c473ab46041133ea6a87dbe0d43e662472adf5 (diff)
Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 28d702b38b..ed470c7ae8 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