diff options
author | Oz Linden <oz@lindenlab.com> | 2013-12-19 17:32:58 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-12-19 17:32:58 -0500 |
commit | 94ac0ffdc30842834bb8b0b6e229b21c7707c026 (patch) | |
tree | 89228c3f10014b430ebe40e1a712fd3ed1fbb1f8 /doc | |
parent | 8b01fd42b0973e9aa5a68761b15a27bdab9e1797 (diff) | |
parent | 6ee6c2795dea314bd1b63984f13bd4b6a0751be1 (diff) |
merge changes for 3.6.12-release
Diffstat (limited to 'doc')
-rwxr-xr-x | doc/contributions.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 124c30ac39..e0d5d7423c 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -681,6 +681,8 @@ Jonathan Yap STORM-1993 OPEN-113 STORM-1975 + STORM-1982 + STORM-1975 STORM-1987 STORM-1982 STORM-1992 |