Merge remote-tracking branch 'origin/onelab' into onelab
authorJavier García <javier.garcial.external@atos.net>
Tue, 21 Apr 2015 15:43:56 +0000 (17:43 +0200)
committerJavier García <javier.garcial.external@atos.net>
Tue, 21 Apr 2015 15:43:56 +0000 (17:43 +0200)
commitb0773f0d25acb85176f11ac2f91ee25baecea20d
tree2ff85ff493ce422d4596a0b2c56de5eb0e06a0fb
parent6ff6f343105cd2ef19a99126b07e8dabf57d65f4
parent9411399e9215852c3bcfdf708f9a9d984596f496
Merge remote-tracking branch 'origin/onelab' into onelab

Conflicts:
myslice/settings.py
portal/sliceresourceview.py
myslice/settings.py
portal/sliceresourceview.py