531321740c
Conflicts: services/presence/server_plugin.py |
||
---|---|---|
.. | ||
clipboard | ||
console | ||
presence | ||
Makefile.am |
531321740c
Conflicts: services/presence/server_plugin.py |
||
---|---|---|
.. | ||
clipboard | ||
console | ||
presence | ||
Makefile.am |