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

author	Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
	Mon, 10 Mar 2014 17:39:20 +0000 (18:39 +0100)
committer	Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
	Mon, 10 Mar 2014 17:39:20 +0000 (18:39 +0100)
commit	c79b3c894ec8a08686ae4978e5375c15ec6f2cbf
tree	db0bee149c21dfc0b9ffaf124f3dbe566fe44f6d	tree \| snapshot
parent	a0149650c8519c69236da8b58720eb94393c8307	commit \| diff
parent	d74c083ca8390ce0812d730bc57ab95728013baf	commit \| diff

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

Conflicts:
portal/static/js/myslice.js

myslice (django)

devel/server-loop.sh	diff1 \|	diff2 \|	blob \| history
plugins/query_editor/static/js/query_editor.js	diff1 \|	diff2 \|	blob \| history
portal/static/css/onelab.css	diff1 \|	diff2 \|	blob \| history
portal/static/js/myslice.js	diff1 \|	diff2 \|	blob \| history
portal/templates/about.html	diff1 \|	diff2 \|	blob \| history
portal/templates/onelab/onelab__widget-topmenu.html	diff1 \|	diff2 \|	blob \| history
portal/templates/onelab/onelab_slice-view.html	diff1 \|	diff2 \|	blob \| history
portal/templates/onelab/onelab_widget-slice-sections.html	diff1 \|	diff2 \|	blob \| history
ui/templates/base.html	diff1 \|	diff2 \|	blob \| history