Conflicts: actions/subscriptions.php lib/router.php lib/xmppmanager.php lib/xmppoutqueuehandler.php |
||
---|---|---|
.. | ||
locale | ||
PtitUrlPlugin.php |
Conflicts: actions/subscriptions.php lib/router.php lib/xmppmanager.php lib/xmppoutqueuehandler.php |
||
---|---|---|
.. | ||
locale | ||
PtitUrlPlugin.php |