Commits
Mateusz Matela authored 8322f202975M
Merge branch '6.2' into temp Conflicts: app/base/src/java/pl/psnc/dlibra/app/gui/common/metadataassist/AutoCompleteTextArea.java app/base/src/java/pl/psnc/dlibra/app/gui/common/metadataassist/MetadataAssistTextArea.java app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/AttributeValueCellEditor.java app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/AttributesValuesTreeTable.java app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/ControlledComboBoxRenderer.java app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/EditorsRenderersManager.java app/cache/src/java/pl/psnc/dlibra/cache/metadata/CachedAttributeValueManager.java server/index/src/java/pl/psnc/dlibra/index/AbstractElementSolrIndexer.java webapp/base/src/webapp/style/dlibra/default/css/main.css
Showing diff to19e93815939