git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0e1e849
d559cf8
)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
author
Loic Baron
<loic.baron@lip6.fr>
Mon, 29 Dec 2014 09:53:03 +0000
(10:53 +0100)
committer
Loic Baron
<loic.baron@lip6.fr>
Mon, 29 Dec 2014 09:53:03 +0000
(10:53 +0100)
Conflicts:
rest/credentials.py
Trivial merge
git://git.onelab.eu / myslice.git / commitdiff