git.onelab.eu Git - myslice.git/commit

author	Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
	Tue, 8 Apr 2014 17:26:40 +0000 (19:26 +0200)
committer	Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
	Tue, 8 Apr 2014 17:26:40 +0000 (19:26 +0200)
commit	ed078cce90a313ddd6e5b41ecff6c14344a99220
tree	7ba7822af60ed66489d823a9eefc7d2ee6b778e4	tree \| snapshot
parent	14f86570e346d23befb6dca4e63d44b27e2e7ecb	commit \| diff
parent	2bf87806cbb956f7bf18e463c55753058635ad00	commit \| diff

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
portal/templates/onelab/onelab_home-view.html

myslice (django)

.settings/org.eclipse.core.resources.prefs	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/home-view.html	diff1 \|	diff2 \|	blob \| history
portal/templates/onelab/onelab_widget-topmenu.html	diff1 \|	diff2 \|	blob \| history