summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-11-22 16:33:13 +0100
committerJonas Smedegaard <dr@jones.dk>2017-11-22 16:33:13 +0100
commiteb87f5802bf71e0760544725f5d24a9dc2bbcc71 (patch)
tree9bf7fd6b81baa304e352321897d7be3607c966ea
parent5d7d7763a24d86cce0b1aadc1f0b8efb80e2f4cc (diff)
Extend with trip to Montpellier to attend RML10.
-rw-r--r--france.mdwn29
1 files changed, 16 insertions, 13 deletions
diff --git a/france.mdwn b/france.mdwn
index ffa60f4..c4e5e2d 100644
--- a/france.mdwn
+++ b/france.mdwn
@@ -36,12 +36,15 @@ Plans currently look like this:
* Visit [François][].
* **Nov 22 - Nov 23**
Car+train+ferry ride to Orø; Siri.
-* **Nov 22**
+* **Nov 22 18:09 - 22:29**
+ Train ride to [Montpellier][][♦][Montpellier OSM]; Jonas.
+ * *Nov 23* Attend [RML10][].
+ * *Nov 24* Attend RML10.
+ * *Nov 25* Attend RML10.
+ * *Nov 26* Attend RML10.
+* **Nov ??**
Train ride to [Brest][][♦][Brest OSM]; Jonas.
* Visit [Santiago][].
-* **Nov ??**
- Train+metro ride to [Montrouge][][♦][Montrouge OSM]; Jonas.
- * Collaborate with [Ordissimo][].
* **Dec 02**
Train ride to [Gütersloh][][♦][Gütersloh OSM]; Jonas.
* Visit Kurt and Gabi.
@@ -92,6 +95,15 @@ via internet.
[Sainte-Bazeille OSM]: <http://www.openstreetmap.org/relation/73939>
"Sainte-Bazeille on OpenStreetMap"
+[Montpellier]: <http://www.openstreetmap.org/relation/Montpellier>
+ "Montpellier on Wikipedia"
+
+[Montpellier OSM]: <http://www.openstreetmap.org/relation/28722>
+ "Montpellier on OpenStreetMap"
+
+[RML10]: https://duniter.org/en/
+ "10th annual developer conference for cryptocoin Ǧ1 (Duniter) incorporating universal dividend and Web-of-Trust"
+
[Brest]: <https://en.wikipedia.org/wiki/Brest,_France>
"Brest on Wikipedia"
@@ -101,14 +113,5 @@ via internet.
[Santiago]: <https://portfolio.debian.net/result?email=santiago@debian.org>
"Santiago Ruano Rincón, Debian developer and network engineer"
-[Montrouge]: <https://en.wikipedia.org/wiki/Montrouge>
- "Montrouge on Wikipedia"
-
-[Montrouge OSM]: <http://www.openstreetmap.org/relation/37026>
- "Montrouge on OpenStreetMap"
-
-[Ordissimo]: <http://www.ordissimo.eu/en>
- "Ordissimo, hardware vendor and Free operating system derived from Debian"
-
[OpenStreetMap workshop]: <https://wiki.skolelinux.de/WikiKalender/2017-12-06>
"OpenStreetMap workshop"