Merge branch 'release/3.12.0' root/tags/taxeditor/3.12.0 3.12.0
[taxeditor.git] / eu.etaxonomy.taxeditor.bulkeditor / icons /
drwxr-xr-x   ..
-rw-r--r-- 295 merge_candidate.gif
-rw-r--r-- 531 merge_target.gif