summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBennett Goble <signal@lindenlab.com>2021-12-11 10:28:35 -0800
committerBennett Goble <signal@lindenlab.com>2021-12-11 10:29:37 -0800
commit0b95b9d008a0878b5d57262e529cef61fb29ea24 (patch)
tree6e12a7949c9a69a5e1ad170220b4e9a82a453142 /doc
parentf729cfc33f258781c5fd85a3d8773bf6149d12db (diff)
parent9957c28ddc5e5c129af2db662da7d69f1509af65 (diff)
Merge branch 'master' into SL-15742
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt5
-rw-r--r--doc/sl-logo.pngbin0 -> 9630 bytes
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 20980fdacd..cc68162c2d 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -270,6 +270,7 @@ Beq Janus
SL-13583
SL-14766
SL-14927
+ SL-11300
Beth Walcher
Bezilon Kasei
Biancaluce Robbiani
@@ -806,6 +807,7 @@ Jonathan Yap
STORM-2104
STORM-2142
SL-10089
+ BUG-229818
Kadah Coba
STORM-1060
STORM-1843
@@ -1358,7 +1360,8 @@ Sovereign Engineer
MAINT-7343
SL-11079
OPEN-343
- SL-11625
+ 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