summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2021-11-23 21:23:45 -0500
committerNat Goodspeed <nat@lindenlab.com>2021-11-23 21:23:45 -0500
commitd71e0a6d4778d4c67b8793ba569fee2db226bc8e (patch)
treedce713230aa611dbada3c6f78903d988b1ae06a4 /doc
parent67ace0df9953ce3264048c3946720a9df492edfa (diff)
parent8852cb9cbd25df8d25fa43cf39b222ab8381ebd6 (diff)
SL-16094, SL-16400: Merge branch 'DRTVWR-546' into glthread
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt3
-rw-r--r--doc/sl-logo.pngbin0 -> 9630 bytes
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 33b169169c..f10ea39275 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -270,6 +270,7 @@ Beq Janus
SL-13583
SL-14766
SL-14927
+ SL-11300
SL-15709
SL-16021
Beth Walcher
@@ -808,6 +809,7 @@ Jonathan Yap
STORM-2104
STORM-2142
SL-10089
+ BUG-229818
Kadah Coba
STORM-1060
STORM-1843
@@ -1361,6 +1363,7 @@ Sovereign Engineer
SL-11079
OPEN-343
SL-11625
+ BUG-229030
SL-14705
SL-14706
SL-14707
diff --git a/doc/sl-logo.png b/doc/sl-logo.png
new file mode 100644
index 0000000000..b9563c7ac7
--- /dev/null
+++ b/doc/sl-logo.png
Binary files differ