Merge "Clarify functionality of 'captionLength' in GalleryOptions"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 8 Jul 2016 19:06:06 +0000 (19:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 8 Jul 2016 19:06:06 +0000 (19:06 +0000)
1  2 
includes/DefaultSettings.php

Simple merge