commit | 611d3f60fab4ee3919924a765290c715d53fcb8e | [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 | 8338f82dcdd433c118a70bf6478093bc369c6643 | |
parent | 6f99356c4b94372c2d797a360c19cfc452e67480 [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