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

author	Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
	Tue, 27 Jan 2015 17:43:26 +0000 (18:43 +0100)
committer	Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
	Tue, 27 Jan 2015 17:43:26 +0000 (18:43 +0100)
commit	5c6d3dfae3a4aed1a18a9f1a946655631328351d
tree	3ab3232bf328fedbe8eb4239660cd99ab9a99e86	tree \| snapshot
parent	43abd432f3e64b33dd6e87d7c15efae684a48a59	commit \| diff
parent	c8396ad1b6cf17a60769496c3b51aa1e390575cc	commit \| diff

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

Conflicts:
portal/actions.py
portal/static/js/myslice.js

myslice (django)

.settings/org.eclipse.core.resources.prefs	diff1 \|	diff2 \|	blob \| history
myslice/settings.py	diff1 \|	diff2 \|	blob \| history
portal/actions.py	diff1 \|	diff2 \|	blob \| history
portal/models.py	diff1 \|	diff2 \|	blob \| history
portal/projectrequestview.py	diff1 \|	diff2 \|	blob \| history
portal/static/css/fed4fire.css	diff1 \|	diff2 \|	blob \| history
portal/static/js/myslice.js	diff1 \|	diff2 \|	blob \| history
portal/templates/_widget-slice-sections.html	diff1 \|	diff2 \|	blob \| history
portal/templates/fed4fire/fed4fire_projectrequest_view.html	diff1 \|	diff2 \|	blob \| history
portal/templates/management-tab-requests.html	diff1 \|	diff2 \|	blob \| history
portal/templates/slice-resource-view.html	diff1 \|	diff2 \|	blob \| history