Merge branch 'main' into main

This commit is contained in:
Hendrik Erz 2022-11-05 17:10:14 +01:00 committed by GitHub
commit 0f61092581
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions

View File

@ -10,14 +10,16 @@ The following are curated lists of academic accounts on Mastodon, sorted by disc
- [Sociology](https://trutzig89182.github.io/Mastodon-Sociologists/) - [Sociology](https://trutzig89182.github.io/Mastodon-Sociologists/)
- [Science and Technology Studies](https://jwyg.github.io/mastodon-sts/) - [Science and Technology Studies](https://jwyg.github.io/mastodon-sts/)
- [Literary Studies](https://docs.google.com/spreadsheets/d/172wtP1Upmv-uUoIAqgTFwP2-_cPdM0Egz5xkTGBbjZU/htmlview) (Google Spreadsheet)
- [Political Scientists](https://brentonpeterson.github.io/Mastodon-PoliScientists/) - [Political Scientists](https://brentonpeterson.github.io/Mastodon-PoliScientists/)
- [Geography](https://lejun.codeberg.page/Mastodon-Geography/) - [Geography](https://lejun.codeberg.page/Mastodon-Geography/)
- [History and Philosophy of Science](https://oliviodare.github.io/mastodon-hps/) - [History and Philosophy of Science](https://oliviodare.github.io/mastodon-hps/)
- [Philosophy](https://eyssette.github.io/Mastodon-Philosophy/) - [Psychology](https://kaitclark.github.io/mastodon-psychology/)
- [History](https://docs.google.com/spreadsheets/d/1zmuH0ffMpCNOEjsReMk5iiqGwiUvhO2TtrM8QKu98SE/htmlview#gid=844879137) (Google Spreadsheet) - [History](https://docs.google.com/spreadsheets/d/1zmuH0ffMpCNOEjsReMk5iiqGwiUvhO2TtrM8QKu98SE/htmlview#gid=844879137) (Google Spreadsheet)
- [Philosophers and Philosophy Teachers](https://eyssette.github.io/Mastodon-Philosophy/) - [Philosophers and Philosophy Teachers](https://eyssette.github.io/Mastodon-Philosophy/)
- [Technology Law & Policy](https://liveuclac-my.sharepoint.com/:x:/g/personal/ucqnmve_ucl_ac_uk/ES11jfqXsNVNpd1roXFokNkBzRux6n2xThtV4CsgqpSj8g?e=rKrajY) (Spreadsheet) - [Technology Law & Policy](https://liveuclac-my.sharepoint.com/:x:/g/personal/ucqnmve_ucl_ac_uk/ES11jfqXsNVNpd1roXFokNkBzRux6n2xThtV4CsgqpSj8g?e=rKrajY) (Spreadsheet)
- [Law](https://mastodon.social/@heidilifeldman/109264840290018068) (Spreadsheet) [info on how to add/remove](https://mastodon.social/@heidilifeldman/109264840290018068) - [Law](https://docs.google.com/spreadsheets/d/1nE8WxgwTFCuVeFA8ZfOW0qonJTSnI_d6EBSJ4E9JqtI/edit?usp=sharing) (Google Spreadsheet; [Form to add yourself](https://forms.gle/hzzbqzvq754NQzDv7))
- [Religion](https://docs.google.com/spreadsheets/d/1uBwBthFWMCTKxMEn6liNosDX8bOEmoNnFZnWD_xu_7E/edit?usp=sharing) (Google Spreadsheet)
## Groups ## Groups
@ -30,6 +32,7 @@ There are also a few groups over on Mastodon that you can use to connect to fell
- [@cognition@a.gup.pe](https://a.gup.pe/u/cognition) (cognitive psychology) - [@cognition@a.gup.pe](https://a.gup.pe/u/cognition) (cognitive psychology)
- [@cogsci@a.gup.pe](https://a.gup.pe/u/cogsci) - [@cogsci@a.gup.pe](https://a.gup.pe/u/cogsci)
- [@philosophy@a.gup.pe](https://a.gup.pe/u/philosophy) - [@philosophy@a.gup.pe](https://a.gup.pe/u/philosophy)
- [@academicchatter@a.gup.pe](https://a.gup.pe/u/academicchatter) (general chat about academic life)
## Servers/communities ## Servers/communities
- [Academic and research servers](https://fediscience.org/server-list.html) - [Academic and research servers](https://fediscience.org/server-list.html)