Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont...
authorlain <lain@soykaf.club>
Wed, 27 Nov 2019 13:48:28 +0000 (14:48 +0100)
committerlain <lain@soykaf.club>
Wed, 27 Nov 2019 13:48:28 +0000 (14:48 +0100)
commit50b152766f3be98bda3c630c3e451e6411053900
tree352863032ff2c6d6ba0e80756e6fe6814e0850df
parentf36724efb1fc0806e11b4c0c32a03d1aeee13da6
parentef1718a045065ec800dbd2b60879a28eb82caad8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
lib/pleroma/web/mastodon_api/views/account_view.ex
test/web/mastodon_api/views/account_view_test.exs