summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2023-11-30 18:09:29 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2023-11-30 18:09:29 +0200
commitc409236dacc215231e8404133c2613d5ee90c990 (patch)
tree25dfeec08de41090e466412d5ae8f5fe948c6146 /doc
parent683bf84bb38adc88d4a4b7fedaed89b41fcac45e (diff)
parentd2ade35b0914f86b1c0239dbf40f5d5972a11b07 (diff)
Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-merge
# Conflicts: # indra/newview/llinventorygallery.cpp # indra/newview/skins/default/xui/en/notifications.xml
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index af8b259c74..3e49ecb3e5 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -842,6 +842,7 @@ Kadah Coba
Jondan Lundquist
Joosten Briebers
MAINT-7074
+ BUG-225288
Josef Munster
Josette Windlow
Juilan Tripsa