| commit | cb0acca6fb0d636a12c79eb9b206dc5d62de9677 | [log] [tgz] |
|---|---|---|
| author | Justin Edelson <justin@apache.org> | Thu Apr 20 15:06:03 2017 +0000 |
| committer | Justin Edelson <justin@apache.org> | Thu Apr 20 15:06:03 2017 +0000 |
| tree | 6bf36d0903a5a2b3ad2463b4f3d39398ea17cd92 | |
| parent | 57665dcf0d918ab20194da3254d696840bc1ecfb [diff] |
Merge branch 'via-resource-type-force' # Conflicts: # bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/package-info.java git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1792071 13f79535-47bb-0310-9956-ffa450edef68