Merge branch 'master' into sv-subs

2017-09-29 21:39:57 +02:00 · 2017-09-29 21:39:57 +02:00 · bb99fa6a00
parent 6ddfe0519d c2b3fcd8ce
commit bb99fa6a00
2 changed files with 5 additions and 0 deletions
--- a/site/data/organisations/organisations.json
+++ b/site/data/organisations/organisations.json
@ -369,6 +369,11 @@
    "img": "tdf.png",
    "url": "https://www.documentfoundation.org"
  },
  {
    "name": "VideoLAN",
    "img": "videolan.png",
    "url": "https://www.videolan.org"
  },
  {
    "name": "Waag Society",
    "img": "waag.png",
--- a/site/static/img/organisations/videolan.png
+++ b/site/static/img/organisations/videolan.png