Merge branch 'develop' into issue/1276
authorMaksim Pechnikov <parallel588@gmail.com>
Thu, 5 Dec 2019 09:22:19 +0000 (12:22 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Thu, 5 Dec 2019 09:22:19 +0000 (12:22 +0300)
commit49bb0a130f93476d32d3177d7a989b7a98a063f2
tree6e64e2bbe2644dd607ec685de5b2bf94c1f9326c
parentb9041c209787dc279d4dc5194d65dff73684cdb9
parent228bf4d214abe3bb62c52128d3bc145e396b174d
Merge branch 'develop' into issue/1276
CHANGELOG.md
docs/API/differences_in_mastoapi_responses.md
lib/pleroma/notification.ex
test/notification_test.exs