diff options
| author | Udo Walter | 2017-11-21 17:52:04 +0100 |
|---|---|---|
| committer | Udo Walter | 2017-11-21 17:52:04 +0100 |
| commit | 653851f35d0eea172c2302e9f1b6f0d03c70096c (patch) | |
| tree | 42f267c360104b98d2e3199273adba62a1e2023b /config.php.example | |
| parent | [internetaccess] reworked permission system from "click and you get error" to... (diff) | |
| parent | [statistics] Also adapt MAC-UUID fixing code to mltk changes (diff) | |
| download | slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.tar.gz slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.tar.xz slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.zip | |
Merge remote-tracking branch 'origin/master' into permission-manager
# Conflicts:
# modules-available/backup/templates/_page.html
# style/default.css
Diffstat (limited to 'config.php.example')
0 files changed, 0 insertions, 0 deletions