Merge branch 'release/2.1.0' into develop
authorChocobozzz <me@florianbigard.com>
Mon, 17 Feb 2020 14:34:42 +0000 (15:34 +0100)
committerChocobozzz <me@florianbigard.com>
Mon, 17 Feb 2020 14:34:42 +0000 (15:34 +0100)
commit2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89
treea814ca1ab71078abe008dae7afc646fb388ca1d8
parent8d3fe90c3f3bfd43366ea41a2519431b9001e744
parent1c5fbed2093c0462e40a092d49d761a043c50e98
Merge branch 'release/2.1.0' into develop
client/src/app/core/server/server.service.ts
server/lib/activitypub/actor.ts