Diffusion A user-friendly XMPP client for every device. eb65786b6a46

Solve remaining merge conflict
eb65786b6a46
Actions

Authored by Melvin Keskin <melvo@olomono.de> on Jul 16 2019, 2:21 PM.

Description

Solve remaining merge conflict

Details

Committed
Melvin Keskin <melvo@olomono.de>Jul 16 2019, 2:21 PM
Parents
R1041:5f6ff4c0fc84: Merge branch 'stable'
Branches
Unknown
Tags
Unknown
Melvin Keskin <melvo@olomono.de> committed R1041:eb65786b6a46: Solve remaining merge conflict (authored by Melvin Keskin <melvo@olomono.de>).Jul 16 2019, 2:21 PM

Changes (1)

PathPackages
MCMakeLists.txt

R1041:eb65786b6a46

View Options

CMakeLists.txt

Loading...