projects
/
mp-sparql-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a9c97a1
0fc331d
)
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mp-sparql
author
Heikki Levanto
<heikki@indexdata.dk>
Fri, 8 May 2015 14:21:16 +0000
(16:21 +0200)
committer
Heikki Levanto
<heikki@indexdata.dk>
Fri, 8 May 2015 14:21:16 +0000
(16:21 +0200)
Conflicts:
bibframe/triplestore.xml
Trivial merge