b8b74817f7
# Conflicts: # main/src/ui/conversation_content_view/file_widget.vala # plugins/CMakeLists.txt # plugins/rtp/src/device.vala # plugins/rtp/src/plugin.vala |
||
---|---|---|
.. | ||
src | ||
tests | ||
CMakeLists.txt |
b8b74817f7
# Conflicts: # main/src/ui/conversation_content_view/file_widget.vala # plugins/CMakeLists.txt # plugins/rtp/src/device.vala # plugins/rtp/src/plugin.vala |
||
---|---|---|
.. | ||
src | ||
tests | ||
CMakeLists.txt |