Fix conflict
authorKANEKO Yoshitaka <info@mevo.xyz>
Sun, 1 Apr 2018 07:58:35 +0000 (16:58 +0900)
committerKANEKO Yoshitaka <info@mevo.xyz>
Sun, 1 Apr 2018 07:58:35 +0000 (16:58 +0900)
commitb3d67750f04d7c72c3e1deeb6df573cbb195146a
treef29550c94667306a66f714f0beb6a338a424b7f9
parent5fa8237bc1dcabca050dc5d8d9325fec649e1723
parentee2503df3ab00a0e8407f0e3eec94da8fd3235bb
Fix conflict
lib/pleroma/web/endpoint.ex