You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		5 years ago
..
object_view.ex	removed legacy api: "/objects/:uuid/likes"	5 years ago
user_view.ex	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	5 years ago