Lucas Mendonça d35d82a426 Fix merge conflicts with master 4 lat temu
..
error.json 4c0094e773 Update README with credits and build instruction 4 lat temu
index.js 269fbdd168 Comitando 5 lat temu
message.json d35d82a426 Fix merge conflicts with master 4 lat temu
ui.json d35d82a426 Fix merge conflicts with master 4 lat temu