]> Frank Brehm's Git Trees - pixelpark/admin-tools.git/commit
Merge branch 'master' into develop
authorFrank Brehm <frank.brehm@pixelpark.com>
Fri, 7 Jul 2017 12:59:32 +0000 (14:59 +0200)
committerFrank Brehm <frank.brehm@pixelpark.com>
Fri, 7 Jul 2017 12:59:32 +0000 (14:59 +0200)
commitfa501efd8d6ec9125230a2621afb03454d192c1e
treeb15c28870593178869d675905478ca39fb4d27b3
parent25d3b994243f7f489761910610b5b78e07113950
parent0f0839becd7db36bb527e5b57d1042cd2573076e
Merge branch 'master' into develop

Conflicts:
pp_lib/mk_home_app.py
pp_lib/ldap_app.py
pp_lib/mk_home_app.py
pp_lib/quota_check.py
quota-check