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

Merge branch 'master' into 'master'

XMPP Service with prosody

See merge request ispconfig/ispconfig3!759
parents d375fad3 95fa12f8
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