David Baker 5f24fc3e5d Fix merge fail

2017-01-24 13:56:22 +00:00

..

avatars

Fix a bunch of linting errors

2017-01-20 14:22:27 +00:00

create_room

Fix a bunch of linting errors

2017-01-20 14:22:27 +00:00

dialogs

Merge remote-tracking branch 'origin/develop' into dbkr/user_search_feedback

2017-01-24 11:26:09 +00:00

elements

Fix merge fail

2017-01-24 13:56:22 +00:00

login

Fix a bunch of linting errors

2017-01-20 14:22:27 +00:00

messages

Fix a bunch of linting errors

2017-01-20 14:22:27 +00:00

room_settings

fix a bunch of dark-theme buttons

2017-01-20 21:00:22 +00:00

rooms

fix a bunch of dark-theme buttons

2017-01-20 21:00:22 +00:00

settings

Fix a bunch of linting errors

2017-01-20 14:22:27 +00:00

voip

Fix a bunch of linting errors

2017-01-20 14:22:27 +00:00