Matthew Hodgson d0158f5812 fix merge conflict

2016-08-04 23:45:28 +01:00

..

login

Less enetering

2016-07-07 13:03:27 +01:00

ContextualMenu.js

Fixed spelling mistake

2016-07-28 15:51:46 +01:00

CreateRoom.js

CreateRoom: remove reference to encryption module

2016-06-23 14:08:45 +01:00

MatrixChat.js

merge in develop

2016-08-04 13:39:47 +01:00

MessagePanel.js

first cut (untested)

2016-07-18 01:35:42 +01:00

RoomStatusBar.js

Comments & required props

2016-07-15 17:15:51 +01:00

RoomView.js

Revert merge up from develop

2016-07-27 14:16:17 +01:00

ScrollPanel.js

Remove relayoutOnUpdate prop on gemini-scrollbar

2016-07-27 11:35:48 +01:00

TimelinePanel.js

many stupid thinkos and bugfixes; make it work

2016-07-20 12:03:13 +01:00

UploadBar.js

fix testing UI hack

2016-04-14 19:11:20 +01:00

UserSettings.js

fix merge conflict

2016-08-04 23:45:28 +01:00