diff options
author | Udo Walter | 2018-11-23 00:12:56 +0100 |
---|---|---|
committer | Udo Walter | 2018-11-23 00:12:56 +0100 |
commit | 778d84a178ff2d635675f7492d19ad853996a452 (patch) | |
tree | de496e4daf48c6a1ef621f51dc5f7b4fec0aa94e /modules-available/locationinfo/inc | |
parent | [dozmod] add network share submodule (diff) | |
parent | [dozmod] Add LDAP filter submodule (diff) | |
download | slx-admin-778d84a178ff2d635675f7492d19ad853996a452.tar.gz slx-admin-778d84a178ff2d635675f7492d19ad853996a452.tar.xz slx-admin-778d84a178ff2d635675f7492d19ad853996a452.zip |
Merge branch 'master' of git.openslx.org:openslx-ng/slx-admin
# Conflicts:
# modules-available/dozmod/page.inc.php
Diffstat (limited to 'modules-available/locationinfo/inc')
0 files changed, 0 insertions, 0 deletions