Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
authorrinpatch <rinpatch@sdf.org>
Thu, 30 Jan 2020 19:16:55 +0000 (22:16 +0300)
committerrinpatch <rinpatch@sdf.org>
Thu, 30 Jan 2020 19:16:55 +0000 (22:16 +0300)
commit5b62acf6e9a38f8d14a9fb37cc85e646fb0169e3
tree6677ba80418ffd34a78cba75498f2c1ab48ba14c
parent45180d4c6058f790475d8ff28018c912db105082
parent946de2299cccebac6718e3a132397ff5c06c67ee
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
CHANGELOG.md
test/web/mastodon_api/controllers/account_controller_test.exs