Merge branch 'libelektra' of janwey/website into master

2018-03-13 14:25:50 +01:00 · 2018-03-13 14:25:50 +01:00 · 950d7a7684
parent f62e76da6f 74f515b69a
commit 950d7a7684
2 changed files with 7 additions and 0 deletions
--- a/site/data/organisations/organisations.json
+++ b/site/data/organisations/organisations.json
@ -545,6 +545,13 @@
    "priority": "0",
    "url": "https://www.linuxwochen.at/"
  },
  {
    "name": "Elektra Initiative",
    "img": "elektra.png",
    "orgtype": "international_ngo",
    "priority": "0",
    "url": "https://www.libelektra.org"
  },
  {
    "name": "Mageia",
    "img": "mageia.png",
--- a/site/static/img/organisations/elektra.png
+++ b/site/static/img/organisations/elektra.png