summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorCallum Prentice <callum@gmail.com>2017-06-08 15:36:42 -0700
committerCallum Prentice <callum@gmail.com>2017-06-08 15:36:42 -0700
commit07185d300d7879fc4d8d268210fa2c440efe02f4 (patch)
tree761fcb3e968339bc04882ea591f56af2fb175187 /doc
parent8d36da00c885f31739ce6bf6dbc162a6ef3a15a1 (diff)
parentcf5865c6e2b27918b526431ccc4309bfc702534e (diff)
Automated merge with head of lindenlab/viewer64
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 0fb6110adb..eb012ee318 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -214,6 +214,7 @@ Ansariel Hiller
MAINT-6953
MAINT-7028
MAINT-7059
+ MAINT-6519
Aralara Rajal
Arare Chantilly
CHUIBUG-191
@@ -770,6 +771,8 @@ Kadah Coba
STORM-1060
STORM-1843
Jondan Lundquist
+Joosten Briebers
+ MAINT-7074
Josef Munster
Josette Windlow
Juilan Tripsa