Merge "Reduce default cookie expiration time to 30 days"

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

Wed, 16 Nov 2016 08:37:07 +0000 (08:37 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 16 Nov 2016 08:37:07 +0000 (08:37 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 16 Nov 2016 08:37:07 +0000 (08:37 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 16 Nov 2016 08:37:07 +0000 (08:37 +0000)
diff --cc RELEASE-NOTES-1.29
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 16 Nov 2016 08:37:07 +0000 (08:37 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 16 Nov 2016 08:37:07 +0000 (08:37 +0000)
		1	2
RELEASE-NOTES-1.29	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history