diff options
author | Anthony Bellew <anthonyreflected@gmail.com> | 2017-01-03 11:51:35 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-03 11:51:35 -0700 |
commit | de154dbd5dbb04d083f5a66dc288d9fef7006c01 (patch) | |
tree | 88a1715021c33add55501351dbf74950deeac481 /app/lib/tag_manager.rb | |
parent | c3e9ba6a66bfcb9e33edebc73adea0a17d7f02a6 (diff) | |
parent | e6657d7342ee1ce08973bf1e5ab89e423eb8b760 (diff) |
Merge pull request #1 from Gargron/master
Catchup merge
Diffstat (limited to 'app/lib/tag_manager.rb')
-rw-r--r-- | app/lib/tag_manager.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/lib/tag_manager.rb b/app/lib/tag_manager.rb index 78dec28aa..4af433200 100644 --- a/app/lib/tag_manager.rb +++ b/app/lib/tag_manager.rb @@ -14,6 +14,8 @@ class TagManager delete: 'http://activitystrea.ms/schema/1.0/delete', follow: 'http://activitystrea.ms/schema/1.0/follow', unfollow: 'http://ostatus.org/schema/1.0/unfollow', + block: 'http://mastodon.social/schema/1.0/block', + unblock: 'http://mastodon.social/schema/1.0/unblock', }.freeze TYPES = { |