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
..
structures	droptarget and usersettings and roomsettings layout tweaks	2016-01-15 15:26:00 +00:00
views	PushRules settings: Applied easy review remarks	2016-01-18 18:07:33 +01:00