Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Tue, 24 Nov 2015 08:19:19 +0000 (09:19 +0100)
committerKatja Luther <k.luther@bgbm.org>
Tue, 24 Nov 2015 08:19:19 +0000 (09:19 +0100)
commit4043da125a461e04c60b90fe822eff9d136da098
treea0e4eb73d54cbc5afd8659ce468efb9b9873b970
parent34e5c4154ce59f3d519a897da108ee4df632916b
parent7d743a995d06d98ec0054ccd047107ed469ac0a4
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop