summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2016-02-29 19:23:47 +0200
committerandreykproductengine <akleshchev@productengine.com>2016-02-29 19:23:47 +0200
commit6a37e654ef5c79b59c66f69f97ca99254b956145 (patch)
tree1d672b007d7c7263d51e75e322870f651488cf0d /doc
parented608e2d5b4923764043f2223da84c74983ded92 (diff)
parentf4e3306517599754f8b4e74e7f97c98dfbcc8429 (diff)
Merge from viewer-lynx and conflict resolution
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 25d9fd02bd..00f70d7ca4 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -187,6 +187,7 @@ Ansariel Hiller
STORM-1979
MAINT-5533
MAINT-5756
+ MAINT-2199
Aralara Rajal
Arare Chantilly
CHUIBUG-191