commit 0e0afa43a546722b3ba2659482fbbf9eab4e0567 Merge: 06343086a 9c12296ed Author: Juergen Daubert <jue@jue.li> Date: Sat Dec 5 15:59:00 2020 +0000 Merge branch '3.5' into 3.6 Conflicts: lsp-plugins/.signature lsp-plugins/Pkgfile p5-class-singleton/.signature p5-datetime/.signature p5-file-listing/.signature p5-types-serialiser/.signature qutebrowser/.footprint qutebrowser/.signature sqlmap/.signature