commit 1bdb09b4dde59c3f5f517d58018394a9d1dad892 Merge: 9d7c86bae 3646f5df2 Author: Juergen Daubert <jue@jue.li> Date: Wed Sep 23 11:09:23 2020 +0000 Merge branch '3.5' into 3.6 Conflicts: lsp-plugins/.signature p5-alien-build/.signature p5-glib-object-introspection/.signature p5-glib/.signature p5-http-message/.signature p5-libwww/.signature p5-list-allutils/.signature p5-log-log4perl/.signature p5-net-dns/.signature p5-perlio-utf8-strict/.signature p5-xml-libxml/.signature picom/.signature pipewire/.signature psycopg2/.footprint psycopg2/.signature python3-attrs/.footprint python3-attrs/.signature python3-cffi/.footprint python3-cffi/.signature python3-psutil/.footprint python3-psutil/.signature python3-pygments/.footprint python3-pygments/.signature python3-ruamel-yaml/.footprint python3-ruamel-yaml/.signature python3-urwid/.footprint python3-urwid/.signature sqlmap/.footprint sqlmap/.signature youtube-dl/.footprint youtube-dl/.signature