| commit | 8d21538b9cc101db8487686116ece3785d87760c | [log] [tgz] |
|---|---|---|
| author | emmanuel lecharny <elecharny@apache.org> | Thu Dec 24 00:37:53 2020 +0100 |
| committer | emmanuel lecharny <elecharny@apache.org> | Thu Dec 24 00:37:53 2020 +0100 |
| tree | 1062cb786f4f82bd9683df02c3f6da179039aae1 | |
| parent | 04212704be56cdcb750ca571081a5e55fa03bfb8 [diff] | |
| parent | 2ec1117fec41919a68d04ba3a51724562e3b46f8 [diff] |
Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-server # Conflicts: # service/src/test/java/org/apache/directory/server/UberJarMainTest.java