Merge branch 'captcha' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 17 Dec 2018 19:45:14 +0000 (19:45 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 17 Dec 2018 19:45:14 +0000 (19:45 +0000)
commit52ac7dce5c460d27d946d26070eb123e89af2914
tree0f1ac473ae10290bd13220552e2cce8db851f5d4
parentc6d5f189d9847b0c23d8150f41c05d87402680eb
parentde981ac5a23673797951096b64a7f5ca49630467
Merge branch 'captcha' into 'develop'

Captcha

See merge request pleroma/pleroma!550
config/config.exs
config/test.exs