diff options
| author | Simon Rettberg | 2017-12-01 13:42:04 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-12-01 13:42:04 +0100 |
| commit | 5393703f6e1485ddff94a50f63bcdd216ab629f4 (patch) | |
| tree | ce2db7130302bd4fb78b170e1fbd75496a1b4510 /inc/user.inc.php | |
| parent | Merge remote-tracking branch 'origin/permission-manager' into permission-manager (diff) | |
| parent | [roomplanner] Sort already placed machines to the bottom (diff) | |
| download | slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.tar.gz slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.tar.xz slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.zip | |
Merge branch 'master' into permission-manager
Diffstat (limited to 'inc/user.inc.php')
0 files changed, 0 insertions, 0 deletions