ansuz ee6c2097f5 resolve merge conflicts

2017-11-23 16:56:49 +01:00

..

app-contacts.less

…

index.html

…

inner.html

…

inner.js

resolve merge conflicts

2017-11-23 16:56:49 +01:00

main.js

…

messenger-ui.js

repair broken 'clear channel' button

2017-11-21 17:19:35 +01:00