Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Wed, 9 Dec 2015 10:19:20 +0000 (11:19 +0100)
committerKatja Luther <k.luther@bgbm.org>
Wed, 9 Dec 2015 10:19:20 +0000 (11:19 +0100)
commit05048d47c564cbca0177b2865d1c7a3b0a7f7eab
tree75d94e045186f1ff923f3a81750a2e8138f51209
parent4bdefadfb4fe675e9ce74c5afef7afe1f60a8fbd
parent599261fd1ededbb954a28a2d85eee0e1a062a893
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop