Ivan Tashkinov 829e997223 [#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
# Conflicts:
#	lib/pleroma/object.ex
#	test/web/activity_pub/transmogrifier_test.exs
#	test/web/ostatus/ostatus_test.exs
2019-07-09 21:46:16 +03:00
..
2019-06-23 08:16:16 +03:00
2019-07-09 16:54:13 +00:00
2019-06-16 20:10:12 +08:00
2019-06-27 01:53:58 +07:00
2019-07-09 16:54:13 +00:00
2019-07-09 17:36:35 +00:00
2018-12-23 20:57:10 +00:00
2018-12-23 20:57:10 +00:00
2018-12-23 20:57:10 +00:00
2019-04-17 14:52:01 +03:00
2019-05-17 07:25:20 +00:00
2019-07-09 16:54:13 +00:00
2019-07-09 16:54:13 +00:00