git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5f4c4f a01625f)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 16:11:24 +0000 (18:11 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 16:11:24 +0000 (18:11 +0200)
1  2 
portal/actions.py patch | diff1 | diff2 | blob | history

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