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-05-15 16:02:15 +00:00
2019-05-13 15:37:38 -05:00
2019-06-23 08:16:16 +03:00
2019-05-30 15:33:58 +07:00
2019-03-20 15:59:54 +03:00
2019-06-27 01:53:58 +07:00
2019-07-09 16:54:13 +00:00
2019-07-03 14:11:04 +07:00
2019-07-09 17:36:35 +00:00
2019-05-15 16:23:01 +00:00
2019-06-19 00:46:30 +03:00
2019-06-14 15:45:05 +00:00
2019-04-22 07:20:43 +00:00
2019-06-24 18:59:12 +00:00
2019-05-06 17:51:03 +00:00
2019-05-08 14:34:36 +00:00
2019-05-06 04:53:12 +02:00
2019-07-09 17:36:35 +00:00