@jonringer as this is a patch release with bugfixes: any reason not to backport this (at least to 20.03)? :)

not really, I more or less am trying to get contributions that are ready to merge into nixpkgs.

I don't see a reason not to

Fine, will do the backport then :)

Backported as b780aef, 44d322f.

@pacien I found one problem though: it's not possible anymore to set default_hs_url and default_server_config at the same time (riot refuses to work in that case).
I stumbled upon this issue as I have a default_hs_url in my config which worked perfectly fine with riot-web 1.5.10. A workaround is to set default_server_config to null (it's only used to set matrix.org as default hs atm). Do you think it's a good idea to unset default_server_config from config.sample.json by default?

@pacien I found one problem though: it's not possible anymore to set default_hs_url and default_server_config at the same time (riot refuses to work in that case).
I stumbled upon this issue as I have a default_hs_url in my config which worked perfectly fine with riot-web 1.5.10. A workaround is to set default_server_config to null (it's only used to set matrix.org as default hs atm). Do you think it's a good idea to unset default_server_config from config.sample.json by default?

There's no default_hs_url config key in the example config file: https://github.com/vector-im/riot-web/blob/develop/config.sample.json.

Yes, the issue occurs if I want to declare it in my config.

You should remove default_hs_url from your configuration because it's deprecated:

From https://github.com/vector-im/riot-web/blob/develop/docs/config.md:

Note: The URLs can also be individually specified as default_hs_url and default_is_url, however these are deprecated.

I don't think we should unset default_server_config because it's quite helpful for new users.

I see, that's the detail I was missing :)
Then it's alright I guess.