Merge branch 'develop' into treeTable
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 22 Jan 2018 15:07:51 +0000 (16:07 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 22 Jan 2018 15:07:51 +0000 (16:07 +0100)
commit888fed29bc302b187f9965d06545b9a250e163f1
treed2642f443a5b212e533aa7b14a95292651626002
parente28f6b05605a65e56ba77cd36bd990701881553a
parentf8da786119170f8890783cc555f00707f0b4e00e
Merge branch 'develop' into treeTable

# Conflicts:
# eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/CharacterMatrix.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/CharacterMatrix.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/categorical/CategoricalDataCellEditor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/quantitative/QuantitativeDataCellEditor.java