From: emilie <emilie@devijver.org>
Date: Tue, 6 Dec 2016 17:47:51 +0000 (+0100)
Subject: Merge branch 'master' of auder.net:valse
X-Git-Url: https://git.auder.net/js/css/%7B%7B%20path%28%27mixstore_user_admin_delete%27%2C%20%7B%20id:%20user.id%20%7D%29%20%7D%7D?a=commitdiff_plain;h=b4899af94061fca34163bdef9ae3ff2155038bb7;p=valse.git

Merge branch 'master' of auder.net:valse
---

b4899af94061fca34163bdef9ae3ff2155038bb7