hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into chat-moderation

Browse source
This commit is contained in:
Alex Gleason 2020-09-11 14:13:38 -05:00
commit 9733c9d065
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
168 changed files with 2652 additions and 8013 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/web/admin_api/controllers/admin_api_controller_test.exs
View file

@ -203,7 +203,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
assert user.note_count == 0
assert user.follower_count == 0
assert user.following_count == 0
assert user.bio == nil
assert user.bio == ""
assert user.name == nil
assert called(Pleroma.Web.Federator.publish(:_))