Commit acb9a1ff authored by spf's avatar spf
Browse files

Merge branch 'maj-instances' into 'master'

Ménage et ajout de Jmeet

See merge request framasoft/framatalk!41
parents be22eb36 9dbf5bfa
Pipeline #405881 passed with stages
in 2 minutes and 48 seconds
......@@ -97,13 +97,13 @@ instances:
website: https://devloprog.org/
chatons: true
country: fr
jesuisfrancobelge:
title: Iloth
endpoint: https://framatalk.jesuisfrancobelge.eu/
website: https://iloth.net/
chatons: false
trust: true
country: fr
#jesuisfrancobelge:
# title: Iloth
# endpoint: https://framatalk.jesuisfrancobelge.eu/
# website: https://iloth.net/
# chatons: false
# trust: true
# country: fr
rezopole:
title: Rezopole
endpoint: https://meeting.rezopole.net/
......@@ -144,13 +144,6 @@ instances:
trust: false
weight: 1
country: nl
drycat:
title: Drycat
endpoint: https://meet.drycat.fr/
website: https://www.drycat.fr/
chatons: true
weight: 1
country: fr
beic:
title: Biblioteca europea di informazione e cultura
endpoint: https://video.beic.it/
......@@ -224,13 +217,6 @@ instances:
chatons: false
trust: false
country: fr
zwindler:
title: Zwindler
endpoint: https://jitsi.zwindler.fr/
website: https://blog.zwindler.fr/
chatons: false
trust: false
country: fr
evolix:
title: Evolix
endpoint: https://meet.evolix.org/
......@@ -259,13 +245,6 @@ instances:
chatons: false
trust: false
country: fr
aquilenet:
title: Aquilenet
endpoint: https://blabla.aquilenet.fr/
website: https://www.aquilenet.fr/
chatons: false
trust: false
country: fr
fdn:
title: French Data Network (FDN)
endpoint: https://talk.fdn.fr/
......@@ -333,13 +312,6 @@ instances:
chatons: false
trust: false
country: it
linus_neumann:
title: Linus Neumann
endpoint: https://meet.linus-neumann.de/
website: https://linus-neumann.de/
chatons: false
trust: false
country: de
andreasufert:
title: Andreas Ufert
endpoint: https://meet.domov.de/
......@@ -384,25 +356,11 @@ instances:
country: be
jisi_rocks_1:
title: jitsi.rocks
endpoint: https://de-fsn-1.jitsi.rocks/
endpoint: https://jitsi.rocks/
website: https://jitsi.rocks/
chatons: false
trust: false
country: de
jisi_rocks_4:
title: jitsi.rocks
endpoint: https://nl-ams-1.jitsi.rocks/
website: https://jitsi.rocks/
chatons: false
trust: false
country: nl
jisi_rocks_6:
title: jitsi.rocks
endpoint: https://fi-hel-2.jitsi.rocks/
website: https://jitsi.rocks/
chatons: false
trust: false
country: fi
arl:
title: arl
endpoint: https://jitsi.arl.wtf/
......@@ -500,13 +458,6 @@ instances:
chatons: false
trust: false
country: nl
collective_tools:
title: Collective Tools
endpoint: https://meet.collective.tools/
website: https://collective.tools/
chatons: false
trust: false
country: se
lenalio:
title: lenalio
endpoint: https://meet.lenalio.fr
......@@ -535,13 +486,6 @@ instances:
chatons: false
trust: false
country: fr
geekinfo:
title: GeekInfo
endpoint: https://jitsi.geekinfo.fr/
website: https://www.geekinfo.fr/
chatons: true
trust: false
country: fr
facil:
title: FACiL
endpoint: https://conference.facil.services/
......@@ -577,13 +521,6 @@ instances:
chatons: false
trust: false
country: nl
hbs_ac:
title: Wohnheim Hainbuchenstraße (HBS)
endpoint: https://jitsi.hbs.ac/
website: https://www.hbs.rwth-aachen.de/
chatons: false
trust: false
country: de
uni_due:
title: Universität Duisburg-Essen (UDE)
endpoint: https://jitsi.uni-due.de/
......@@ -731,13 +668,6 @@ instances:
chatons: false
trust: false
country: de
cyber4edu:
title: Cyber4EDU
endpoint: https://meet.cyber4edu.org/
website: https://cyber4edu.org
chatons: false
trust: false
country: de
lug_stormarn:
title: Linux User Group Stormarn
endpoint: https://meet.lug-stormarn.de/
......@@ -759,13 +689,6 @@ instances:
chatons: false
trust: false
country: de
blb_nrw:
title: Bau- und Liegenschaftsbetrieb NRW
endpoint: https://videokonferenz.homeip.net/
website: https://www.blb.nrw.de/
chatons: false
trust: false
country: de
hasi:
title: Hasi e.V.
endpoint: https://meet.hasi.it/
......@@ -773,13 +696,6 @@ instances:
chatons: false
trust: false
country: de
derhagen:
title: derhagen
endpoint: https://jitsi.derhagen.eu/
website: https://jitsi.derhagen.eu/
chatons: false
trust: false
country: de
kbu_freifunk:
title: Freifunk Köln, Bonn und Umgebung
endpoint: https://meet.kbu.freifunk.net/
......@@ -822,13 +738,6 @@ instances:
chatons: false
trust: false
country: de
mpi_bremen:
title: Max-Planck-In­sti­tut für Ma­ri­ne Mi­kro­bio­lo­gie
endpoint: https://jitsi.mpi-bremen.de/
website: https://www.mpi-bremen.de/
chatons: false
trust: false
country: de
teamcloud:
title: TeamCloud
endpoint: https://meet.teamcloud.work/
......@@ -906,13 +815,6 @@ instances:
chatons: false
trust: false
country: nl
0x5e:
title: 0x5e.eu
endpoint: https://jitsi.0x5e.eu/
website: https://jitsi.0x5e.eu/
chatons: false
trust: false
country: nl
operationtulip:
title: OperationTulip
endpoint: https://meet.operationtulip.com/
......@@ -982,3 +884,10 @@ instances:
chatons: false
trust: false
country: fr
jmeet:
title: Jmeet
endpoint: https://jmeet.fr/
website: https://jmeet.fr/
chatons: false
trust: false
country: fr
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment