Merge branch 'master' of amcclure/site into master

This commit is contained in:
Ben Harris 2019-01-05 13:16:20 -05:00 committed by Gitea
commit 6ed906a8f1
1 changed files with 20 additions and 0 deletions

View File

@ -12,6 +12,26 @@
]
]
},
{
"description": "thunix offers Shell (SSH) accounts, Web Hosting, Email Accounts, and many other things to people free of charge.",
"link": "https://www.thunix.cf",
"name": "thunix Shell Provider and Web Host",
"channel": "#thunix",
"sysadmins": [
[
"amcclure",
"https://www.thunix.cf/~amcclure"
]
[
"ubergeek",
"https://phoenix.thunix.cf/~ubergeek"
]
[
"naglfar",
"https://phoenix.thunix.cf/~naglfar"
]
]
},
{
"description": "to provide a space in the tildeverse for experimentation with and education of the OpenBSD operating system",
"link": "http://tilde.institute",