Merge branch 'bfsf' of janwey/website into master

2018-03-08 15:49:29 +01:00 · 2018-03-08 15:49:29 +01:00 · d1673e45f4
parent 654836f624 a0ad735319
commit d1673e45f4
2 changed files with 7 additions and 0 deletions
--- a/site/data/organisations/organisations.json
+++ b/site/data/organisations/organisations.json
@ -76,6 +76,13 @@
    "priority": "1",
    "url": "https://ansol.org/"
  },
+  {
+    "name": "Barcelona Free Software Friends",
+    "img": "barcelonafsfriends.png",
+    "orgtype": "regional_ngo",
+    "priority": "0",
+    "url": "https://bcnfs.org/"
+  },
  {
    "name": "Bergamo Linux Users Group",
    "img": "bglug.png",
--- a/site/static/img/organisations/barcelonafsfriends.png
+++ b/site/static/img/organisations/barcelonafsfriends.png