diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-11 10:53:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 10:53:58 +0100 |
| commit | 2cfa55185a5fc7d93a160a4e9a4730aae6725b0f (patch) | |
| tree | c57169b5a3d717f4e68b8ec5d2d6e220d1456434 /app/lib/activitypub/adapter.rb | |
| parent | d1da0a1086fa25f22739277fbf32ba1b3745317d (diff) | |
| parent | 394525e32994e605093c87d3a9fad2a4202f3401 (diff) | |
Merge pull request #885 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/activitypub/adapter.rb')
| -rw-r--r-- | app/lib/activitypub/adapter.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb index d35cae889..99f4d9305 100644 --- a/app/lib/activitypub/adapter.rb +++ b/app/lib/activitypub/adapter.rb @@ -10,6 +10,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers', 'sensitive' => 'as:sensitive', 'movedTo' => { '@id' => 'as:movedTo', '@type' => '@id' }, + 'alsoKnownAs' => { '@id' => 'as:alsoKnownAs', '@type' => '@id' }, 'Hashtag' => 'as:Hashtag', 'ostatus' => 'http://ostatus.org#', 'atomUri' => 'ostatus:atomUri', |