Peter Korsgaard c287d789b7 Merge branch 'next' ... A number of merge conflicts, but hopefully they are all sorted out now. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>		2020-09-02 18:14:46 +02:00
..
conf
manual	Merge branch 'next'	2020-09-02 18:14:46 +02:00
website	docs/website/news.html: add 2020.08 announcement link	2020-09-01 23:04:48 +02:00
images