From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sun, 9 Aug 2015 03:27:50 +0000 (+0000)
Subject: Merge "Match salt of WatchAction::show() and getWatchToken()"
X-Git-Tag: 1.31.0-rc.0~10480
X-Git-Url: http://git.cyclocoop.org/%27.parametre_url%28%20%20%20generer_action_auteur%28%27charger_plugin%27%2C%20%27update_flux%27%29%2C%27update_flux%27%2C%20%27oui%27%29.%27?a=commitdiff_plain;h=f6fd34a95ee94d33dc01a5be91e2f5032fac2165;p=lhc%2Fweb%2Fwiklou.git

Merge "Match salt of WatchAction::show() and getWatchToken()"
---

f6fd34a95ee94d33dc01a5be91e2f5032fac2165