Kegan Dougal 69cac307d9 Merge branch 'develop' into kegan/guest-peek-then-join

2016-01-13 13:22:58 +00:00

..

login

Implement password reset

2016-01-12 17:20:16 +00:00

CreateRoom.js

update copyright for 2016

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

MatrixChat.js

merge in develop, fixing conflicts

2016-01-13 13:06:27 +00:00

RoomView.js

Merge branch 'develop' into kegan/guest-peek-then-join

2016-01-13 13:22:58 +00:00

ScrollPanel.js

Set our own booleans instead of using isMounted

2016-01-11 11:38:04 +00:00

UploadBar.js

update copyright for 2016

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

UserSettings.js

Implement guest account upgrading

2016-01-07 17:23:32 +00:00