git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdd9b51 341176d)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Tue, 22 Jul 2014 12:48:55 +0000 (09:48 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 22 Jul 2014 12:48:55 +0000 (09:48 -0300)
1  2 
portal/actions.py patch | diff1 | diff2 | blob | history

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