diff options
| author | Christian Klinger | 2016-07-05 10:18:52 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-07-05 10:18:52 +0200 |
| commit | 1c364128619b838f8245d898e9cde902ac7a42bf (patch) | |
| tree | 70977c7cc0d232d58a2cf278f8778e88829723b9 /modules-available/bootstrap_multiselect/config.json | |
| parent | minimal changes (diff) | |
| parent | Update translations (diff) | |
| download | slx-admin-1c364128619b838f8245d898e9cde902ac7a42bf.tar.gz slx-admin-1c364128619b838f8245d898e9cde902ac7a42bf.tar.xz slx-admin-1c364128619b838f8245d898e9cde902ac7a42bf.zip | |
Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into modularization
Conflicts:
modules-available/main/templates/main-menu.html
Diffstat (limited to 'modules-available/bootstrap_multiselect/config.json')
0 files changed, 0 insertions, 0 deletions