[#1364] Resolved merge conflicts with `develop`.
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 14 Apr 2020 17:19:08 +0000 (20:19 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 14 Apr 2020 17:19:08 +0000 (20:19 +0300)
commitf7e623c11c4b6f4f323a4317e9489092be73f9cd
treee03ec6a306e4cf8eb894916904cfabf8381b8c47
parent0cda80f266c03557b47112e52bfe748655b4321c
[#1364] Resolved merge conflicts with `develop`.
lib/pleroma/notification.ex