diff options
author | Jonathan Yap <none@none> | 2011-02-15 16:10:21 -0500 |
---|---|---|
committer | Jonathan Yap <none@none> | 2011-02-15 16:10:21 -0500 |
commit | eff712570d389d1b7b36153c48b17d906d5eada3 (patch) | |
tree | a3eb4a444fcc23a8d79510c4bdd3de04afe6cc9a /doc | |
parent | 457683bf51039a1bf9114efe47b9f00e4df842a8 (diff) | |
parent | 3555849644ff228a189dd2a21e57def22f142e5d (diff) |
STORM-990 Merged from current v-d trying to resolve merge issue Oz was having
Diffstat (limited to 'doc')
-rw-r--r-- | doc/contributions.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 5aad56ba3b..2bee8c44bc 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -394,10 +394,7 @@ Jonathan Yap STORM-869 VWR-17801 VWR-24347 - STORM-844 - STORM-643 - STORM-960 - STORM-953 + STORM-975 STORM-990 Kage Pixel VWR-11 |