Skip to content
Commit da7054a9 authored by tmortagne's avatar tmortagne
Browse files

Merge branch 'feature-extension-separatelocalinstalled' 

Conflicts:
	xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-api/src/main/java/org/xwiki/extension/repository/internal/core/DefaultCoreExtensionRepository.java
	xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-api/src/main/java/org/xwiki/extension/repository/internal/local/DefaultInstalledExtensionRepository.java
	xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-api/src/main/java/org/xwiki/extension/repository/internal/local/DefaultLocalExtensionRepository.java
parents 3bd1f7d9 c52494b3
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment