summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2023-07-17 23:17:29 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2023-07-17 23:17:29 +0300
commit07ff9a5d67cefdae1bc112b19947f7ba173c9dbb (patch)
tree97299a554b4a4ea2453d675abc8a2d40595566d3 /doc
parent834a8eeddeda035551ed4071273c26e806946147 (diff)
parentec4135da63a3f3877222fba4ecb59b15650371fe (diff)
Merge branch 'main' into DRTVWR-582-maint-U
# Conflicts: # doc/contributions.txt # indra/llcommon/llerrorthread.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 d1ba28acd2..2545d684dd 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1189,6 +1189,7 @@ PanteraPolnocy
SL-18904
SL-18937
SL-19207
+ 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