Differences

This shows you the differences between two versions of the page.

--- marine_colab:charm_offensive_experiment [2015-03-17 09:40] – 80.195.184.135
+++ marine_colab:charm_offensive_experiment [2015-04-27 15:34] (current) – nik
@@ Line 1: / Line 1: @@
 ==== Charm Offensive Experiment ====
-(an experiment from the [[workshop_201503|March workshop]])
+(an [[experiment]] from the [[workshop_201503|March workshop]])
 ===Hypothesis / Challenge===
@@ Line 18: / Line 18: @@
 The day could be organised at the world ocean summit, or the plasticity forum, bringing people from ocean conservation together with people from renewable energy, plastics and/or fisheries.
-{{>https://www.flickr.com/photos/foam/16624611407}}
+{{>http://www.flickr.com/photos/foam/16624611407}}
 [[https://www.flickr.com/photos/foam/16624611407|full size image]]