tree 966e319a281ba8e143fef60e3992f0695e421fcd
parent f24e81cae465a07898ea6dd4a0504ef944609f07
parent 676985bc1bf31b2f9dd8601a7a80332e48941063
author Simo Tripodi <stripodi@adobe.com> 1561981830 +0200
committer Simo Tripodi <stripodi@adobe.com> 1561981830 +0200

Merge branch 'master' into avoid_subpackages_flattering

# Conflicts:
#	src/main/java/org/apache/sling/feature/cpconverter/acl/DefaultAclManager.java
#	src/test/java/org/apache/sling/feature/cpconverter/acl/AclManagerTest.java
#	src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPolicyEntryHandlerTest.java