Merge branch 'master' into develop

pull/1272/head
Chocobozzz 2018-11-13 15:32:12 +01:00
commit be0f59b4ee
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 1 additions and 1 deletions

View File

@ -24,7 +24,7 @@ function activityPubContextify <T> (data: T) {
sensitive: 'as:sensitive', sensitive: 'as:sensitive',
language: 'sc:inLanguage', language: 'sc:inLanguage',
views: 'sc:Number', views: 'sc:Number',
stats: 'sc:Number', state: 'sc:Number',
size: 'sc:Number', size: 'sc:Number',
fps: 'sc:Number', fps: 'sc:Number',
commentsEnabled: 'sc:Boolean', commentsEnabled: 'sc:Boolean',