summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-07-17 23:34:59 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-07-17 23:34:59 +0300
commitacf82867b61535b7b39b89f71a282e3ce3d0673e (patch)
tree2795aa7a92d291d5535d935ab0782cfdf6ec45e4 /doc
parentd3233e787aaf1ba0558a714d5216ea70c7249c36 (diff)
parentec4135da63a3f3877222fba4ecb59b15650371fe (diff)
Merge branch 'main' (DRTVWR-580) into DRTVWR-567
# Conflicts: # indra/llui/llfolderviewitem.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorymodelbackgroundfetch.cpp
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index cf3f7668f2..11a58dfbc5 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1189,6 +1189,7 @@ PanteraPolnocy
SL-18891
SL-18904
SL-18937
+ SL-19681
Parvati Silverweb
Patric Mills
VWR-2645
@@ -1413,6 +1414,7 @@ Sovereign Engineer
SL-18497
SL-18525
SL-18534
+ SL-19336
SpacedOut Frye
VWR-34
VWR-45