Barış Soner Uşaklı 5cc39e8546 Merge remote-tracking branch 'refs/remotes/origin/master' into develop ...

# Conflicts:
#	package.json
#	src/views/admin/manage/ip-blacklist.tpl

2017-08-24 19:29:15 -04:00

..

create.js

show max message length in error message

2017-04-19 20:56:12 -04:00

data.js

Merge branch 'master' into notif-abort

2017-05-09 11:31:58 -06:00

delete.js

fix message delete and add test

2017-08-21 16:48:18 -04:00

edit.js

ESlint padded-blocks

2017-02-18 02:32:24 -07:00

notifications.js

removed references to libs that aren't used

2017-07-17 12:40:50 -04:00

rooms.js

notifications tests

2017-05-20 21:01:55 -04:00

unread.js

ESlint padded-blocks

2017-02-18 02:32:24 -07:00