2 Commits

Author	SHA1	Message	Date
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
David Baker	cd89fed834	Move deb control stuff into builder ... We need to change it between release & nightly and it's probably not much use for anyone else, and gets rid of the confusing errors about the 'control' file not existing.	2020-03-07 12:23:00 +00:00