Commits

Mateusz Matela authored 6ff992492b4M
Merge branch '6.3' into rcin Conflicts: webapp/base/src/webapp/WEB-INF/components.xml webapp/base/src/webapp/WEB-INF/components/resources/WEBAPP_en.xml webapp/base/src/webapp/WEB-INF/components/resources/WEBAPP_pl.xml webapp/base/src/webapp/style/dlibra/default/js/main.min.js webapp/components/project.xml
Showing diff to880cf8e6b0b