Learn more about cloning repositories
You have read-only access
Merge branch '6.0' into 6.1 Conflicts: server/metadata/src/java/pl/psnc/dlibra/metadata/server/LibCollectionManagerImpl.java webapp/base/src/etc/web.xml