git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d750d30
ce9d7fe
)
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
author
Loic Baron
<loic.baron@lip6.fr>
Thu, 7 Aug 2014 19:03:29 +0000
(16:03 -0300)
committer
Loic Baron
<loic.baron@lip6.fr>
Thu, 7 Aug 2014 19:03:29 +0000
(16:03 -0300)
Conflicts:
portal/templates/fibre/fibre_registration_view.html
portal/templates/fibre/fibre_user_register_complete.html
Trivial merge
git://git.onelab.eu / myslice.git / commitdiff