David Baker 99abd58f1a Merge remote-tracking branch 'origin/develop' into notif_sync

2016-01-07 10:41:16 +00:00

..

login

update copyright for 2016

2016-01-07 04:06:52 +00:00

CreateRoom.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

MatrixChat.js

Merge remote-tracking branch 'origin/develop' into notif_sync

2016-01-07 10:41:16 +00:00

RoomView.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

ScrollPanel.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

UploadBar.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

UserSettings.js

update copyright for 2016

2016-01-07 04:06:52 +00:00