git://git.onelab.eu / myslice.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0769179 f67d901)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 2 Apr 2014 10:42:43 +0000 (12:42 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 2 Apr 2014 10:42:43 +0000 (12:42 +0200)
commit9cbecc70e8916a0574e32088a15617c33c03bf9d
treecaa29237beaef2584dc482fb233e7b6a16eaa00etree | snapshot
parent076917967b51efd65acb391d90d41f4112791bf0commit | diff
parentf67d901951fa3b3dfae6a2692156dfa7ab67c496commit | diff
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
portal/templates/base.html
auth/manifoldbackend.py diff1 | diff2 | blob | history
plugins/googlemap/static/js/googlemap.js diff1 | diff2 | blob | history
plugins/querytable/static/js/querytable.js diff1 | diff2 | blob | history
portal/sliceresourceview.py diff1 | diff2 | blob | history
portal/templates/_widget-topmenu.html diff1 | diff2 | blob | history
portal/templates/base.html diff1 | diff2 | blob | history
portal/templates/fed4fire/fed4fire_home-view.html blob1 | blob2 | history
portal/templates/fed4fire/fed4fire_widget-topmenu.html diff1 | diff2 | blob | history
portal/templates/home-view.html diff1 | diff2 | blob | history
portal/templates/onelab/onelab_home-view.html blob1 | blob2 | history
portal/templates/onelab/onelab_widget-topmenu.html diff1 | diff2 | blob | history
myslice (django)