element-desktop/riot.im
J. Ryan Stinnett a0c3295eed Remove Conflicts from riot-desktop
Some early testing suggests removing this will allow the install of the riot-web
transitional package to proceed.

Part of https://github.com/vector-im/riot-web/issues/13509
2020-05-07 11:29:38 +01:00
..
nightly Remove cross-signing feature flag because it's not a feature 2020-04-24 10:19:33 -06:00
release Remove Conflicts from riot-desktop 2020-05-07 11:29:38 +01:00
New_Vector_Ltd.pem Nope, that didn't work. Try the cert file, 2020-03-06 15:57:25 +00:00
README Initial copy of files from the riot-web repo 2019-12-06 18:17:34 +00:00

This directory contains the config file for the official riot.im distribution
of Riot Desktop.

You probably do not want to build with this config unless you're building the
official riot.im distribution, or you'll find your builds will replace
themselves with the riot.im build.