From: Benjamin Auder Date: Thu, 6 Feb 2020 19:18:59 +0000 (+0100) Subject: merge with remote X-Git-Url: https://git.auder.net/app_dev.php/%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=f32535f2bc8d50470aa87204bbd7971805dbc9ef;p=valse.git merge with remote --- f32535f2bc8d50470aa87204bbd7971805dbc9ef