tree 1062cb786f4f82bd9683df02c3f6da179039aae1
parent 04212704be56cdcb750ca571081a5e55fa03bfb8
parent 2ec1117fec41919a68d04ba3a51724562e3b46f8
author emmanuel lecharny <elecharny@apache.org> 1608766673 +0100
committer emmanuel lecharny <elecharny@apache.org> 1608766673 +0100

Merge branch 'master' of
https://gitbox.apache.org/repos/asf/directory-server

# Conflicts:
#	service/src/test/java/org/apache/directory/server/UberJarMainTest.java