Merge branch 'master' into develop

2018-11-13 15:32:12 +01:00 · 2018-11-13 15:32:12 +01:00 · be0f59b4ee
parent 891bc4f8bf 1cf8aca11d
commit be0f59b4ee
1 changed files with 1 additions and 1 deletions
--- a/server/helpers/activitypub.ts
+++ b/server/helpers/activitypub.ts
@ -24,7 +24,7 @@ function activityPubContextify <T> (data: T) {
        sensitive: 'as:sensitive',
        language: 'sc:inLanguage',
        views: 'sc:Number',
-        stats: 'sc:Number',
+        state: 'sc:Number',
        size: 'sc:Number',
        fps: 'sc:Number',
        commentsEnabled: 'sc:Boolean',