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

author	Javier García <javier.garcial.external@atos.net>
	Mon, 1 Dec 2014 12:03:09 +0000 (13:03 +0100)
committer	Javier García <javier.garcial.external@atos.net>
	Mon, 1 Dec 2014 12:03:09 +0000 (13:03 +0100)
commit	3aae671a1ca0cef870a268b88ddcde8d520d7621
tree	a8d4ad607571b8da30e07a25b2817f22cb1f663d	tree \| snapshot
parent	d3828739b742f18881ce982179ea0f75b080ed71	commit \| diff
parent	de6f0bbb7cd3ae3086a6485072803b53f2c4d9f6	commit \| diff

Merge branch 'fed4fire' into onelab

Conflicts:
plugins/queryupdater/static/js/queryupdater.js
portal/templates/base.html