Commits

Mateusz Matela authored e24199c0889M
Merge branch 'dlab' into rcin Conflicts: app/ARiA.launch extensions/project.properties project.properties server/SERVER.launch server/metadata/src/java/pl/psnc/dlibra/metadata/server/AttributeValueManagerImpl.java webapp/base/src/webapp/style/dlibra/default/css/main.css webapp/base/src/webapp/style/dlibra/default/js/main.min.js
Showing diff to037e92dfde9