aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/doc
diff options
context:
space:
mode:
Diffstat (limited to 'linden/doc')
-rw-r--r--linden/doc/contributions.txt22
1 files changed, 19 insertions, 3 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index a1e46fd..57745e2 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -46,6 +46,25 @@ Aleric Inglewood
46 VWR-10759 46 VWR-10759
47 VWR-10837 47 VWR-10837
48 IMP-581 48 IMP-581
49 SNOW-800
50 RED-429
51 RED-552
52 RED-553
53 RED-554
54 RED-556
55 RED-560
56 RED-561
57 RED-562
58 RED-565
59 RED-566
60 RED-567
61 RED-573
62 RED-575
63 RED-576
64 RED-577
65 RED-578
66 RED-579
67 RED-581
49Alissa Sabre 68Alissa Sabre
50 VWR-81 69 VWR-81
51 VWR-83 70 VWR-83
@@ -87,11 +106,8 @@ Alissa Sabre
87 VWR-7087 106 VWR-7087
88 VWR-7153 107 VWR-7153
89 VWR-7168 108 VWR-7168
90<<<<<<< HEAD
91=======
92 VWR-7087 109 VWR-7087
93 VWR-7086 110 VWR-7086
94>>>>>>> origin/next
95 VWR-9190 111 VWR-9190
96 VWR-10728 112 VWR-10728
97 VWR-12620 113 VWR-12620