Merge branch 'fix/1691-feed-render' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 16 Apr 2020 18:38:58 +0000 (18:38 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 16 Apr 2020 18:38:58 +0000 (18:38 +0000)
commit28bcde5d982ee0cd7bfac68585311661f19de2c4
treee07ebc7ace22fc1078d5b500fe02e0c7bf13e1eb
parent0ddee13c832df08da65ad0b1b7c11eea18afba26
parent4d330d9df13b7ff5d24fdd8b4eec1e111fa51297
Merge branch 'fix/1691-feed-render' into 'develop'

Fix for use of `published` field from different entities

Closes #1691

See merge request pleroma/pleroma!2395