Commit Graph

1281 Commits (012c70ed96a2558c139708042b39a74535480ff4)

Author SHA1 Message Date
max.mehl 4f5cd3293f
improve wording 2018-02-09 15:05:04 +01:00
max.mehl 30b04921e7
Merge branch 'master' of git.fsfe.org:pmpc/website 2018-02-07 12:51:00 +01:00
max.mehl 4f6df6f17b
Merge PR #217 2018-02-07 12:49:52 +01:00
Max Mehl f27a0bb826 Merge branch 'kersnikova' of janwey/website into master 2018-02-07 12:44:57 +01:00
Mikkel Kirkgaard Nielsen ae67463b92
Add PROSA as supporting organisation
PROSA is the "Danish Association of IT Professionals".

Verify their support in the newsletter at
http://nyhedsbrev.prosa.dk/t/t-e-khtlyud-ykdlijuhl-r/.

Ole Tange on behalf of PROSA also requested addition as supporting
organisation in email correspondance with contact@fsfe.org during
October/November 2017.
2018-02-01 15:45:08 +01:00
Jan Weymeirsch eea503ee11 Add Freifunk 2018-02-01 10:13:13 +01:00
Jan Weymeirsch 1201a850b4 Edit: Change URL of Kersnikova 2018-02-01 10:02:48 +01:00
max.mehl 399efd3a3b
Merge PR #215 2018-01-31 10:48:41 +01:00
max.mehl 5b63eb940e
Merge PR #214 2018-01-31 10:48:23 +01:00
Jan Weymeirsch f5887bb88d Add Rampa 2018-01-30 17:01:43 +01:00
Jan Weymeirsch 5cc40843a8 Add Kersnikova 2018-01-30 16:53:17 +01:00
pablohn 7c5e7ae2ed Spanish grammar fixes
I add ¿ and ! marks
2018-01-22 15:22:01 +01:00
max.mehl 692c0ce383
fix conflict 2018-01-15 16:51:06 +01:00
Max Mehl 2fe61e808f Merge branch 'fossgis' of janwey/website into master 2018-01-15 16:47:55 +01:00
Jan Weymeirsch 36f09ab505 Add Software in Public Interest 2018-01-15 15:38:37 +01:00
Jan Weymeirsch 56dca1492a Add FOSSGIS 2018-01-15 09:57:57 +01:00
Max Mehl e7b2ca2513 Merge branch 'master' of schiessle/pmpc-website into master 2018-01-12 17:04:01 +01:00
Bjoern Schiessle 525a665d9d
add 'Offene Kommunen NRW' 2018-01-12 16:59:12 +01:00
Carmen Bianca Bakker ff6d6ca837
Merge branch 'italian-vid' 2018-01-11 11:52:15 +01:00
Carmen Bianca Bakker 799114b557
Fix Italian video 2018-01-11 11:51:20 +01:00
Carmen Bianca Bakker 43d1c5e5e8
Merge branch 'gimp' 2018-01-10 10:12:49 +01:00
Carmen Bianca Bakker 56af3104d1
Added GIMP 2018-01-10 10:10:02 +01:00
Carmen Bianca Bakker be0d677779
Merge branch 'apertus' 2018-01-05 13:21:36 +01:00
Carmen Bianca Bakker bb1eee6a5d
Add apertus° 2018-01-05 13:20:48 +01:00
Carmen Bianca Bakker 8421db97ad
Merge branch 'lila' 2018-01-04 11:55:38 +01:00
Carmen Bianca Bakker 6d011ca4ba
Added LILA 2018-01-04 11:55:24 +01:00
Carmen Bianca Bakker 007e398ae1
Merge branch 'drupal' 2017-12-22 12:11:07 +01:00
Carmen Bianca Bakker 93c1168b6e
Added Drupal 2017-12-22 12:10:54 +01:00
max.mehl b11cc49f15
Merge PR #209 2017-12-21 12:17:55 +01:00
Sebastiano Pistore da69957d69 Update ITA translation 2017-12-20 16:26:43 +01:00
Carmen Bianca Bakker d8d724151f
Merge branch 'linuxmuster' 2017-12-20 11:22:44 +01:00
Carmen Bianca Bakker 34887f3445
Add linuxmuster.net 2017-12-20 11:22:33 +01:00
Carmen Bianca Bakker c5b153d8d6
Merge branch 'lliure' 2017-12-19 12:48:26 +01:00
Carmen Bianca Bakker e22c2321f1
Add Hacking Lliure 2017-12-19 12:48:09 +01:00
Carmen Bianca Bakker 1dc481a226
Merge branch 'samtgemeinde' 2017-12-15 12:40:21 +01:00
Carmen Bianca Bakker 102ced5457
Added Elbmarsch 2017-12-15 12:39:35 +01:00
Carmen Bianca Bakker c2627350d1
Merge branch 'typo3' 2017-12-12 15:53:00 +01:00
Carmen Bianca Bakker 6b0b5e0365
Add typo3 2017-12-12 15:52:27 +01:00
Max Mehl db2861a42c Merge branch 'test/test-commit' of max.mehl/pmpc-website into master 2017-12-12 11:20:32 +01:00
max.mehl 67f87d0c51
make a fake-commit for https://github.com/go-gitea/gitea/issues/2513 2017-12-12 11:18:53 +01:00
Carmen Bianca Bakker 9d73b0efc9
Merge branch 'sentilo' 2017-12-07 14:18:11 +01:00
Carmen Bianca Bakker c0e2f7cff7
Added Sentilo 2017-12-07 14:17:57 +01:00
Carmen Bianca Bakker bc7981790d
Rename OpenSUSE to openSUSE 2017-11-29 18:10:33 +01:00
Carmen Bianca Bakker add15421bf
Added Otevrena mesta 2017-11-29 16:24:07 +01:00
Carmen Bianca Bakker 5a1a35b5ec
Added Fedora 2017-11-22 15:23:50 +01:00
Carmen Bianca Bakker cf86d9694d
Merge branch 'wilhelm' 2017-11-22 15:18:19 +01:00
Carmen Bianca Bakker 9d63300382
Added Wilhelm Tux 2017-11-22 15:18:09 +01:00
Carmen Bianca Bakker bc58534c0e
Merge branch 'bcn' 2017-11-22 10:24:56 +01:00
Carmen Bianca Bakker c743a077da
added bcn 2017-11-22 10:24:16 +01:00
Max Mehl 29069d9446 fake-commit 2017-11-21 13:12:23 +01:00