| commit | c05e1e0f78b958dd4db2334a3851b94a9f6aa984 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Onofré <jbonofre@apache.org> | Sun Sep 20 21:06:44 2015 +0200 |
| committer | Jean-Baptiste Onofré <jbonofre@apache.org> | Sun Sep 20 21:06:44 2015 +0200 |
| tree | 1738c02aa64668097fff4326730d994fd940b677 | |
| parent | 778fcd4c2fbc852ac9b1b0d78673b2a07590ea47 [diff] | |
| parent | da1fdb304980f29a8b887efad1dec72c0c1aeef3 [diff] |
Merge branch 'KARAF-3646' of https://github.com/albertocsm/karaf-cellar Conflicts: assembly/src/main/resources/features.xml pom.xml