Merge remote-tracking branch 'origin/main'

# Conflicts:
#	README.md
This commit is contained in:
sneakers-the-rat 2023-06-14 00:52:54 -07:00
commit 843f384083
1 changed files with 4 additions and 0 deletions

View File

@ -1,5 +1,8 @@
# masto-bridges (formerly masto-gitsocial-bridge) # masto-bridges (formerly masto-gitsocial-bridge)
Mirrored to https://github.com/sneakers-the-rat/masto-gitsocial-bridge if for some godforsaken reason you want to raise issues or pull requests or fork it or whatever
## CalDAV to Masto (and back again) ## CalDAV to Masto (and back again)
Post directly from your (CalDAV) calendar, and follow your feeds from your calendar! Post directly from your (CalDAV) calendar, and follow your feeds from your calendar!
@ -30,6 +33,7 @@ To make it so only your posts are added to your calendar, set the stream mode to
bridge between mastodon and bcrypt's [git-social](https://github.com/diracdeltas/tweets) bridge between mastodon and bcrypt's [git-social](https://github.com/diracdeltas/tweets)
### From git to masto ### From git to masto
Post on git-social... Post on git-social...