Merge branch 'remove-footguns' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 15 Apr 2019 13:57:38 +0000 (13:57 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 15 Apr 2019 13:57:38 +0000 (13:57 +0000)
commit776f1e3bdf148b2a9be4b99fff0578af76a700cb
treed4e87cb5d9a1ec15e58d4fc498eedfa951c833f9
parent56956de6fa1818d52e870fe719e6e20a0e408a30
parent088f378408e7bc9b4dd916141cba813de3276e90
Merge branch 'remove-footguns' into 'develop'

Remove ambiguous documentation regarding emoji and config.exs

See merge request pleroma/pleroma!1064