git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22d09f1 c4cd929)
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre fibre
authorRezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Tue, 14 Jul 2015 18:26:50 +0000 (15:26 -0300)
committerRezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Tue, 14 Jul 2015 18:26:50 +0000 (15:26 -0300)
Conflicts:
portal/homeview.py

1  2 
portal/actions.py patch | diff1 | diff2 | blob | history
portal/homeview.py patch | diff1 | diff2 | blob | history
portal/templates/fibre/fibre_institution.html patch | diff1 | diff2 | blob | history

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