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	Merge branch 'develop' into push-rules-settings	2016-01-18 18:14:20 +01:00
views	Merge pull request #653 from vector-im/matthew/roomsettings2	2016-01-18 13:39:55 +00:00