manuroe 33edeccb43 Merge branch 'develop' into push-rules-settings ...

# Conflicts:
#	src/component-index.js
#	src/components/views/rooms/RoomSettings.js

2016-01-18 18:00:41 +01:00

..

structures

Merge branch 'develop' into push-rules-settings

2016-01-18 18:00:41 +01:00

views

Merge branch 'develop' into push-rules-settings

2016-01-18 18:00:41 +01:00