Merge "Add code to write to change_tag_def table"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Thu, 7 Jun 2018 16:26:23 +0000 (16:26 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 7 Jun 2018 16:26:23 +0000 (16:26 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 7 Jun 2018 16:26:23 +0000 (16:26 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 7 Jun 2018 16:26:23 +0000 (16:26 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/changetags/ChangeTags.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 7 Jun 2018 16:26:23 +0000 (16:26 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 7 Jun 2018 16:26:23 +0000 (16:26 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/changetags/ChangeTags.php	patch \|	diff1 \|	diff2 \|	blob \| history