summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-11-16 09:52:59 -0500
committerOz Linden <oz@lindenlab.com>2016-11-16 09:52:59 -0500
commitfd2ccb16068dfd21307b17e78e384d8ae19fef12 (patch)
tree3e40dcddd3117820008047b81ec218e9cc0ffb7c /doc
parent8baf88a073f30d217e03ee56b4a255121ac98071 (diff)
parentecd93e56781498ef73ea2a3d5be0c449179b6a0a (diff)
merge changes for 4.1.2-release
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 8ed41ddc34..f7d1ece72f 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -190,9 +190,19 @@ Ansariel Hiller
STORM-2094
MAINT-5756
MAINT-4677
+ MAINT-6300
+ MAINT-6397
MAINT-6432
+ MAINT-6513
+ MAINT-6514
+ MAINT-6552
STORM-2133
MAINT-6511
+ MAINT-6612
+ MAINT-6637
+ MAINT-6636
+ MAINT-6744
+ MAINT-6752
Aralara Rajal
Arare Chantilly
CHUIBUG-191
@@ -790,6 +800,7 @@ Kitty Barnett
MAINT-6152
MAINT-6153
MAINT-6154
+ MAINT-6568
Kolor Fall
Komiko Okamoto
Korvel Noh
@@ -1021,6 +1032,7 @@ Nicky Dasmijn
OPEN-187
STORM-2010
STORM-2082
+ MAINT-6665
Nicky Perian
OPEN-1
STORM-1087