Skip to content
Commit 552e5b1a authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'master' into 'master'

various fix

add  XMPP remote API endpoint

add XMPP remote API permissions

allow wildcards for jailkit copy  (eg: if we want php-cli and modules in jailkit chrooted environnement `/usr/bin/php /etc/php5/cli/conf.d /usr/lib/php5/*/*.so`), this is an admin function, unnecessary security point)

See merge request !492
parents a405c378 3df3ff8a
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment