summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2021-11-16 01:09:11 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2021-11-16 01:09:11 +0200
commit30c381406c4891cce439c66ca17b26247f0a698c (patch)
tree2196833344c813e2d6bf4b963adc517c30050697 /doc
parent764788c9bc549715aed119c639ac919067f38a92 (diff)
parent9957c28ddc5e5c129af2db662da7d69f1509af65 (diff)
Merge branch 'master' into DRTVWR-530-maint
# Conflicts: # doc/contributions.txt
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 9f56af0530..04ae79dc90 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -270,6 +270,7 @@ Beq Janus
SL-13583
SL-14766
SL-14927
+ SL-11300
SL-16021
Beth Walcher
Bezilon Kasei
@@ -807,6 +808,7 @@ Jonathan Yap
STORM-2104
STORM-2142
SL-10089
+ BUG-229818
Kadah Coba
STORM-1060
STORM-1843
@@ -1360,7 +1362,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