Jan Tojnar 8f50f1ce10 Merge branch 'staging-next' into staging ... Resolved the following conflicts: - kernel flags between 09176d28a0 and 2b28822d8d - clojure-lsp between 3fa00685ce and e03c068af5		2021-02-19 17:15:31 +01:00
..
default.nix	Merge branch 'staging-next' into staging	2021-02-19 17:15:31 +01:00
docbook2texi.patch	git: 2.19.2 -> 2.21.0	2019-02-25 19:21:45 +00:00
git-send-email-honor-PATH.patch	git: 2.19.2 -> 2.21.0	2019-02-25 19:21:45 +00:00
git-sh-i18n.patch	git: 2.19.2 -> 2.21.0	2019-02-25 19:21:45 +00:00
installCheck-path.patch	git: 2.19.2 -> 2.21.0	2019-02-25 19:21:45 +00:00
ssh-path.patch	git: 2.19.2 -> 2.21.0	2019-02-25 19:21:45 +00:00
update.sh	git: Fix the update.sh script and use HTTPS	2020-04-21 14:30:11 +02:00