From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 13 Aug 2012 20:04:30 +0000 (+0000)
Subject: Merge "add 'passwortreset' right to list of available rights"
X-Git-Tag: 1.31.0-rc.0~22753
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=948f80ba5d2554cb6e23bf9a9b58e69d59d94008;p=lhc%2Fweb%2Fwiklou.git

Merge "add 'passwortreset' right to list of available rights"
---

948f80ba5d2554cb6e23bf9a9b58e69d59d94008
diff --cc includes/User.php
index 40577fe7a6,0511c98629..55ef71e197
--- a/includes/User.php
+++ b/includes/User.php
@@@ -140,8 -140,8 +140,9 @@@ class User 
  		'nominornewtalk',
  		'noratelimit',
  		'override-export-depth',
+ 		'passwordreset',
  		'patrol',
 +		'patrolmarks',
  		'protect',
  		'proxyunbannable',
  		'purge',