Merge from exxess #39

Closed

exxess wants to merge 4 commits from (deleted):master into master

pull from: (deleted):master

merge into: infra:master

infra:master

infra:kea

infra:pizza

Conversation 2 Commits 4 Files Changed 1 +1

4 Commits

Author	SHA1	Message	Date
Christian	29953a550c	Merge remote-tracking branch 'upstream/master'	2020-11-13 10:02:03 +01:00
Christian	8d8f3f19bf	add me as admin	2020-11-12 19:51:53 +01:00
Christian	2cd51da2d7	Merge remote-tracking branch 'upstream/master'	2020-11-12 19:41:57 +01:00
Christian	14b99b20b7	jitsi: complete setup	2020-05-23 21:52:02 +02:00