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
..
2018-12-23 20:57:10 +00:00
2019-02-03 18:54:39 +01:00
2019-02-03 18:54:39 +01:00
2019-07-08 20:05:02 +03:00
2019-07-05 04:22:08 +00:00