git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b153ca1 d6cee2b)
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Fri, 25 Jul 2014 18:31:07 +0000 (15:31 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 25 Jul 2014 18:31:07 +0000 (15:31 -0300)
1  2 
portal/actions.py patch | diff1 | diff2 | blob | history

diff --cc portal/actions.py
Simple merge
myslice (django)