Jorik Schellekens 2294d23b32 Merge branch 'develop' into joriks/appearance-advanced		2020-06-22 11:27:48 +01:00
..
auth	fix requested changes from #3991	2020-06-16 23:11:32 +02:00
avatars	Small fixes	2020-04-27 18:36:05 +01:00
context_menus	Small fixes	2020-04-27 18:36:05 +01:00
dialogs	Revert "Use recovery keys over passphrases"	2020-06-18 09:35:11 +01:00
directory	Network Dropdown fix things not scrolling properly	2020-04-18 15:08:15 +01:00
elements	Fix Styled Checkbox and Radio Button disabled state	2020-06-17 14:26:22 +01:00
emojipicker	Fix Emoji Picker footer being too small if text overflows	2020-05-24 20:00:02 +01:00
groups
messages	Rename trash (custom).svg as electron doesn't like serving files with spaces	2020-05-12 16:16:47 +01:00
right_panel	Small fixes	2020-04-27 18:36:05 +01:00
room_settings	more margin between published and local addresses	2020-03-16 18:30:40 +01:00
rooms	Merge pull request #4765 from matrix-org/travis/room-list/show-less	2020-06-17 10:24:50 -06:00
settings	fix style	2020-06-15 17:46:16 +01:00
terms	Use variables for the rem values.	2020-03-31 15:26:23 +01:00
verification	Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js	2020-04-07 19:03:12 +01:00
voip	Use variables for the rem values.	2020-03-31 15:26:23 +01:00