git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f7d83a 3a41bc1)
t pushMerge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 23 Jan 2015 13:36:32 +0000 (14:36 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 23 Jan 2015 13:36:32 +0000 (14:36 +0100)
1  2 
portal/institution.py patch | diff1 | diff2 | blob | history
portal/templates/institution.html patch | diff1 | diff2 | blob | history

diff --cc portal/institution.py
Simple merge
diff --cc portal/templates/institution.html
Simple merge
myslice (django)