merge
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Wed, 15 Apr 2015 17:28:03 +0000 (19:28 +0200)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Wed, 15 Apr 2015 17:28:03 +0000 (19:28 +0200)
commita61c68825e91ea92162c737ffa6a7c2f2fcde78d
tree57ba1eadfb10064653fa5528b04ff1bf046b618f
parentbb7c2839a257b071008c32fe4a39eb5e48864368
parent4b88d97b444f7c3b0ab05c7e1e25ce1a9eaf1b9e
merge
.settings/org.eclipse.core.resources.prefs
influxdb/client.py
portal/slicetabmeasurements.py
portal/static/css/onelab.css
portal/templates/onelab/onelab_slice-view.html
portal/templates/onelab/onelab_widget-slice-sections.html
portal/templates/slice-view.html