Ivan Tashkinov a11a7176d5 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ...

# Conflicts:
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/activity_pub/transmogrifier.ex

2019-10-21 11:05:09 +03:00

..

object_view.ex

removed legacy api: "/objects/:uuid/likes"

2019-10-04 22:35:26 +03:00

user_view.ex

Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation

2019-10-21 11:05:09 +03:00