Merge branch 'fix/2189-unpin-activity' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 29 Sep 2020 17:42:08 +0000 (17:42 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 29 Sep 2020 17:42:08 +0000 (17:42 +0000)
commit7f83b35a9dea7181b57d9b975742233813fa3a8b
tree381d2644f34e86f1aada07f432a3ee0da2917cb4
parent2a11068a11caa33bbd3fc66f175c5511f8ab2eaf
parentb3a9ba09ec5867d240c3769ae4c3fbf598f68d92
Merge branch 'fix/2189-unpin-activity' into 'develop'

#2189 More robust expires_at timestamp processing

See merge request pleroma/pleroma!3046