git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79852f1 bbc146e)
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Fri, 31 Jan 2014 15:23:24 +0000 (16:23 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 31 Jan 2014 15:23:24 +0000 (16:23 +0100)
1  2 
portal/actions.py patch | diff1 | diff2 | blob | history

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