mirror of https://git.zx2c4.com/cgit/
Merge branch 'stable'
Conflicts: scan-tree.c Signed-off-by: Lars Hjemli <hjemli@gmail.com>lh/pretty-blob-view
commit
69f705cf57
Conflicts: scan-tree.c Signed-off-by: Lars Hjemli <hjemli@gmail.com>lh/pretty-blob-view