Merge "Add $wgMaxUserDBWriteDuration to limit user-generated transactions"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 7 Dec 2015 21:25:24 +0000 (21:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 7 Dec 2015 21:25:24 +0000 (21:25 +0000)
1  2 
autoload.php
languages/i18n/en.json
languages/i18n/qqq.json

diff --cc autoload.php
Simple merge
Simple merge
Simple merge