git://git.onelab.eu
/
unfold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
36a5593
)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
author
Loic Baron
<loic.baron@lip6.fr>
Wed, 17 Dec 2014 10:46:51 +0000
(11:46 +0100)
committer
Loic Baron
<loic.baron@lip6.fr>
Wed, 17 Dec 2014 10:46:51 +0000
(11:46 +0100)
Conflicts:
myslice/settings.py
No differences found
git://git.onelab.eu / unfold.git / commitdiff