zelo72
/
documentation
mirror of https://github.com/mastodon/documentation
1
0
Fork 0
Code Issues 6 Releases Wiki Activity

Merge branch 'master' into master

This commit is contained in:
Eugen Rochko 2017-04-25 17:00:23 +02:00 committed by GitHub
parent 734885cb57 d9e67db907
commit 8048ec966e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Using-Mastodon/FAQ.md
View File

@ -96,7 +96,7 @@ Click on **Getting Started**, then **Extended Information**. An info page displa
![Getting Started](https://octodon.social/media/TKlZpSNRRcHBOEFNlGs) ![Extended Information](https://octodon.social/media/D7bfl1NYzNy4XIT8nLs) ![Info Page](https://octodon.social/media/zvoI8yUt4uurZcKqFRk)
#### Wow, I keep seeing offensive stuff from a particular instance, is there a way to block *all* of it?
Not without a lot of clicking, sorry. But, your instance admin can do it! Please contact her.
Not without a lot of clicking, sorry. But, your instance admin can do it! Please contact them.
#### How do I get verified with a “✅”?
“✅” is an emoji, *only* for lulz. There is no verification on Mastodon. You can copy and paste “✅” into your bio if you wish, you cheeky monkey.

1
Using-the-API/API.md
View File

@ -56,6 +56,7 @@ ___
- [For C#](https://github.com/pawotter/mastodon-api-cs)
- [For Haskell](https://github.com/syucream/hastodon)
- [For Crystal](https://github.com/decors/mastodon.cr)
- [For C#(.NET Standard)](https://github.com/yamachu/Mastodot)
___