merge

1 files changed, 35 insertions, 3 deletions

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 1f52d3e1ef..1b08b91baf 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -66,12 +66,14 @@ Aleric Inglewood
 	SNOW-626
 	SNOW-756
 	SNOW-764
+	SNOW-800
 	VWR-10001
 	VWR-10579
 	VWR-10759
 	VWR-10837
 	VWR-12691
 	VWR-12984
+	VWR-13040
 	VWR-13996
 	VWR-14426
 	VWR-24247
@@ -79,16 +81,25 @@ Aleric Inglewood
 	VWR-24252
 	VWR-24254
 	VWR-24261
+	VWR-24315
+	VWR-24317
+	VWR-24320
+    VWR-24321
+ 	VWR-24354
+	VWR-24519
 	SNOW-84
 	SNOW-477
 	SNOW-744
 	SNOW-766
 	STORM-163
+	STORM-955
+	STORM-960
 Ales Beaumont
 	VWR-9352
 	SNOW-240
 Alexandrea Fride
     STORM-255
+	STORM-960
 Alissa Sabre
 	VWR-81
 	VWR-83
@@ -221,6 +232,8 @@ Catherine Pfeffer
 Celierra Darling
 	VWR-1274
 	VWR-6975
+Coaldust Numbers
+    VWR-1095
 Cron Stardust
 	VWR-10579
 Cypren Christenson
@@ -366,15 +379,27 @@ JB Kraft
 Joghert LeSabre
 	VWR-64
 Jonathan Yap
-	STORM-596
+	STORM-435
 	STORM-523
+	STORM-596
+	STORM-615
 	STORM-616
+	STORM-643
 	STORM-679
-	STORM-737
+	STORM-723
 	STORM-726
+	STORM-737
+	STORM-785
 	STORM-812
+	STORM-829
+	STORM-844
+	STORM-869
 	VWR-17801
-	STORM-785
+	VWR-24347
+	STORM-844
+	STORM-643
+	STORM-960
+	STORM-953
 Kage Pixel
 	VWR-11
 Ken March
@@ -391,6 +416,7 @@ Kitty Barnett
 	STORM-288
 	STORM-799
 	STORM-800
+    VWR-24217
 Kunnis Basiat
 	VWR-82
 	VWR-102
@@ -601,6 +627,7 @@ Robin Cornelius
 	SNOW-599
 	SNOW-747
 	STORM-422
+	STORM-960
 	VWR-2488
 	VWR-9557
 	VWR-10579
@@ -649,6 +676,8 @@ Sergen Davies
 	CT-321
 Shawn Kaufmat
 	SNOW-240
+Siana Gearz
+	STORM-960
 SignpostMarv Martin
 	VWR-153
 	VWR-154
@@ -734,6 +763,7 @@ Thickbrick Sleaford
 	VWR-9287
 	VWR-13483
 	VWR-13947
+	VWR-24420
 Thraxis Epsilon
 	SVC-371
 	VWR-383
@@ -754,6 +784,8 @@ Twisted Laws
 	SNOW-352
 	STORM-466
 	STORM-467
+	STORM-844
+	STORM-643
 Vadim Bigbear
 	VWR-2681
 Vector Hastings