Google Git
Sign in
apache / sling-org-apache-sling-distribution-core / 4498772058609d846032494be9a72a77cc87d0b4
commit4498772058609d846032494be9a72a77cc87d0b4[log] [tgz]
authorDirk Rudolph <dirk.rudolph@netcentric.biz>Tue Jan 09 11:39:04 2018 +0100
committerDirk Rudolph <dirk.rudolph@netcentric.biz>Tue Jan 09 11:39:04 2018 +0100
treebad78cf68e581513d5558553dd724d7e8f6d6c73
parent81bab452beb24d4daf3307596be6689acf9fcccf [diff]
parentd7efe52fcadd55b2bf5c1587ed4e3a5bf86e1169 [diff]
Merge remote-tracking branch 'upstream/master' into feature/SLING-7360

# Conflicts:
#	src/main/java/org/apache/sling/distribution/packaging/impl/AbstractDistributionPackageBuilder.java
#	src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
#	src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackageBuilder.java
tree: bad78cf68e581513d5558553dd724d7e8f6d6c73
  1. src/
  2. .gitignore
  3. LICENSE
  4. pom.xml
  5. README.md
README.md

Apache Sling Distribution Core

This module is part of the Apache Sling project.