git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5909aec d9c4cf9)
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
authorRezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Fri, 24 Oct 2014 18:03:17 +0000 (16:03 -0200)
committerRezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Fri, 24 Oct 2014 18:03:17 +0000 (16:03 -0200)
1  2 
portal/actions.py patch | diff1 | diff2 | blob | history
portal/homeview.py patch | diff1 | diff2 | blob | history

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