diff options
| author | Wim <wim@42.be> | 2016-11-13 23:12:17 +0100 |
|---|---|---|
| committer | Wim <wim@42.be> | 2016-11-13 23:12:17 +0100 |
| commit | af1ad82c8eb823c054cf1ba40c7c3b6b61c45fce (patch) | |
| tree | 3d489fcfc0516b7a2aeb7344c07461cd4caa0f89 /bridge/xmpp | |
| parent | 497633867759601d658233257447b5b86aa1b01e (diff) | |
| download | matterbridge-msglm-af1ad82c8eb823c054cf1ba40c7c3b6b61c45fce.tar.gz matterbridge-msglm-af1ad82c8eb823c054cf1ba40c7c3b6b61c45fce.tar.bz2 matterbridge-msglm-af1ad82c8eb823c054cf1ba40c7c3b6b61c45fce.zip | |
Fix merge issue
Diffstat (limited to 'bridge/xmpp')
0 files changed, 0 insertions, 0 deletions