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
..
matrix-react-sdk	Merge branch 'develop' into push-rules-settings	2016-01-18 18:14:20 +01:00
vector-web	PushRules settings: Show unmanaged rules into an "advanced section"	2016-01-15 16:45:27 +01:00
common.css	Merge branch 'develop' into push-rules-settings	2016-01-18 18:14:20 +01:00
hide.css	skin RoomDropTarget correctly	2015-11-05 11:21:45 +00:00