Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Thu, 10 Dec 2015 09:52:16 +0000 (10:52 +0100)
committerKatja Luther <k.luther@bgbm.org>
Thu, 10 Dec 2015 09:52:16 +0000 (10:52 +0100)
commit4a70e77a9c9cf9ad8e4d80f8e51cba175bf3ffea
tree794533859e1e166d4dc1f8c67849526cd636887a
parent4a077484b15de9d627e3a597d979fc9b143b35bc
parent3dfd2e656b743ef6e47204a78a6a36f66a8af45d
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop