summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-12-05 17:40:04 -0500
committerOz Linden <oz@lindenlab.com>2016-12-05 17:40:04 -0500
commit295a4c63b4912f05a729178e8e34ba26e92ff37b (patch)
tree19fc1232fc6f8040ce5598fdd9649646116f7ea9 /doc
parent2d8ad89f33e9fa65dea11fd4c78962fc568ee00a (diff)
parent05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (diff)
merge changes for 5.0.0-release
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index f7d1ece72f..521be7b7e2 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -12,6 +12,7 @@ Able Whitman
Adam Marker
VWR-2755
Adeon Writer
+ MAINT-1211
Aeonix Aeon
Agathos Frascati
CT-246
@@ -317,6 +318,7 @@ Catherine Pfeffer
VWR-1282
VWR-8624
VWR-10854
+Cathy Foil
Cayu Cluny
Celierra Darling
VWR-1274
@@ -870,6 +872,7 @@ MartinRJ Fayray
STORM-1845
STORM-1911
STORM-1934
+Matrice Laville
Matthew Anthony
Matthew Dowd
VWR-1344
@@ -1244,6 +1247,7 @@ Shnurui Troughton
Shyotl Kuhr
MAINT-1138
MAINT-2334
+ MAINT-6913
Siana Gearz
STORM-960
STORM-1088
@@ -1277,6 +1281,7 @@ Sovereign Engineer
MAINT-6107
STORM-2107
MAINT-6218
+ MAINT-6913
SpacedOut Frye
VWR-34
VWR-45