From: emilie Date: Thu, 16 Mar 2017 15:58:45 +0000 (+0100) Subject: Merge branch 'master' of auder.net:valse X-Git-Url: https://git.auder.net/img/css/%7B%7B%20path%28%27fos_user_resetting_request%27%29%20%7D%7D?a=commitdiff_plain;h=f33f35efc9a01f93bb61959522d90ee6a76b892e;p=valse.git Merge branch 'master' of auder.net:valse --- f33f35efc9a01f93bb61959522d90ee6a76b892e