rinpatch 74346a7035 Fix merge conflict

2019-01-18 18:31:25 +03:00

..

config.exs

Fix merge conflict

2019-01-18 18:31:25 +03:00

dev.exs

…

emoji.txt

…

prod.exs

…

test.exs

…