manuroe fdf5b0a4fc Merge branch 'develop' into push-rules-settings ...

# Conflicts:
#	src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css

2016-01-18 18:14:20 +01:00

..

login

CSS for forgot password link

2016-01-12 16:39:29 +00:00

CreateRoom.css

copyrights for 2016

2016-01-07 04:17:56 +00:00

MatrixChat.css

copyrights for 2016

2016-01-07 04:17:56 +00:00

RoomView.css

Merge pull request #653 from vector-im/matthew/roomsettings2

2016-01-18 13:39:55 +00:00

UploadBar.css

shuffle around all the CSS to de-atomify it and make it match the react components

2016-01-03 00:10:17 +00:00

UserSettings.css

Merge branch 'develop' into push-rules-settings

2016-01-18 18:14:20 +01:00