]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Merge branch 'v4-12-stable' (samba-4.12.14) into 'v4-12-test'
authorStefan Metzmacher <metze@samba.org>
Wed, 24 Mar 2021 10:25:31 +0000 (11:25 +0100)
committerStefan Metzmacher <metze@samba.org>
Wed, 24 Mar 2021 10:25:31 +0000 (11:25 +0100)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
1  2 
VERSION

diff --cc VERSION
Simple merge