git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6949cc5 cd7a1a9)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 20 Feb 2015 10:54:22 +0000 (11:54 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 20 Feb 2015 10:54:22 +0000 (11:54 +0100)
1  2 
portal/static/css/smartfire.css patch | diff1 | diff2 | blob | history

diff --cc portal/static/css/smartfire.css
Simple merge
myslice (django)