BGBM BDI Projects
/
taxeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a9f32ef
1828f87
)
Merge branch 'release/3.7.0'
author
jenkins
<jenkins-int@bgbm.org>
Wed, 15 Jul 2015 16:35:53 +0000
(18:35 +0200)
committer
jenkins
<jenkins-int@bgbm.org>
Wed, 15 Jul 2015 16:35:53 +0000
(18:35 +0200)
Conflicts:
eu.etaxonomy.taxeditor.feature/feature.xml
Trivial merge