Merge from 'master'

Merge branch 'master' of git.fsfe.org:pmpc/website
lektura
Erik Da Silva 2017-09-20 18:17:36 +02:00
commit f2738fb84b
7 changed files with 30 additions and 0 deletions

View File

@ -1,4 +1,14 @@
[ [
{
"name": "ADDULACT",
"img": "addulact.png",
"url": "http://adullact.org/"
},
{
"name": "Aquilenet",
"img": "aquilenet.png",
"url": "https://www.aquilenet.fr/"
},
{ {
"name": "Asociația pentru Tehnologie și Internet", "name": "Asociația pentru Tehnologie și Internet",
"img": "apti.png", "img": "apti.png",
@ -114,6 +124,11 @@
"img": "ffkp.png", "img": "ffkp.png",
"url": "http://ffkp.se/" "url": "http://ffkp.se/"
}, },
{
"name": "FOSSASIA",
"img": "fossasia.png",
"url": "https://fossasia.org/"
},
{ {
"name": "Framasoft", "name": "Framasoft",
"img": "framasoft.png", "img": "framasoft.png",
@ -144,6 +159,11 @@
"img": "GNOME.png", "img": "GNOME.png",
"url": "https://www.gnome.org" "url": "https://www.gnome.org"
}, },
{
"name": "GNU Solidario",
"img": "gnusolidario.png",
"url": "http://www.gnusolidario.org/"
},
{ {
"name": "GreekLUG", "name": "GreekLUG",
"img": "greeklug.png", "img": "greeklug.png",
@ -154,6 +174,11 @@
"img": "galpon.png", "img": "galpon.png",
"url": "https://www.galpon.org/" "url": "https://www.galpon.org/"
}, },
{
"name": "gvSIG Association",
"img": "gvsig.png",
"url": "http://www.gvsig.com/"
},
{ {
"name": "HackYourPhD", "name": "HackYourPhD",
"img": "HackYourPhD.png", "img": "HackYourPhD.png",
@ -248,6 +273,11 @@
"name": "quintessenz - Verein zur Wiederherstellung der Bürgerrechte im Informationszeitalter", "name": "quintessenz - Verein zur Wiederherstellung der Bürgerrechte im Informationszeitalter",
"img": "quintessenz.png", "img": "quintessenz.png",
"url": "http://quintessenz.at" "url": "http://quintessenz.at"
},
{
"name": "Slovensko.Digital",
"img": "slovenskodigital.png",
"url": "https://slovensko.digital/"
}, },
{ {
"name": "Softcatalà", "name": "Softcatalà",

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB