Merge branch 'lliure'

2017-12-19 12:48:26 +01:00 · 2017-12-19 12:48:26 +01:00 · c5b153d8d6
parent 1dc481a226 e22c2321f1
commit c5b153d8d6
2 changed files with 5 additions and 0 deletions
--- a/site/data/organisations/organisations.json
+++ b/site/data/organisations/organisations.json
@ -264,6 +264,11 @@
    "img": "gvsig.png",
    "url": "http://www.gvsig.com/"
  },
+  {
+    "name": "Hacking Lliure",
+    "img": "lliure.png",
+    "url": "https://hackinglliure.org/"
+  },
  {
    "name": "HackYourPhD",
    "img": "HackYourPhD.png",
--- a/site/static/img/organisations/lliure.png
+++ b/site/static/img/organisations/lliure.png