diff options
author | Callum Prentice <callum@lindenlab.com> | 2021-07-19 17:43:19 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2021-07-19 17:43:19 -0700 |
commit | a242edc99d62f9f242c2f7f778f347af03a6f5a9 (patch) | |
tree | 74c5672c9a045e5c8891702cc77eae9062dc9756 /doc | |
parent | 95b26d3becf8fef901ea09998866a9d8227cdcad (diff) | |
parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) |
Merge with Master after Viewer Release (also fixed some glaring automerge screw ups)
Diffstat (limited to 'doc')
-rwxr-xr-x | doc/contributions.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 8ae828e738..20980fdacd 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -226,6 +226,7 @@ Ansariel Hiller SL-13364 SL-13858 SL-13697 + SL-13395 SL-3136 Aralara Rajal Arare Chantilly @@ -268,6 +269,7 @@ Beq Janus SL-11300 SL-13583 SL-14766 + SL-14927 Beth Walcher Bezilon Kasei Biancaluce Robbiani |