Commit 5a6907d4 authored by Sophie Brun's avatar Sophie Brun

Merge branch 'kali/master' of into kali/master

parents 2c28227c 9737449f
debian-branch = kali/master
debian-tag = kali/%(version)s
pristine-tar = True
patch-numbers = False
multimaint-merge = True
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment