sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jus...@apache.org
Subject svn propchange: r1792071 - svn:log
Date Thu, 20 Apr 2017 15:09:20 GMT
Author: justin
Revision: 1792071
Modified property: svn:log

Modified: svn:log at Thu Apr 20 15:09:20 2017
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Apr 20 15:09:20 2017
@@ -1,4 +1 @@
-Merge branch 'via-resource-type-force'
-
-# Conflicts:
-#	bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/package-info.java
+SLING-5739 - pluggable @Via providers / SLING-6778 - supporting delegate models


Mime
View raw message