Jaiwanth 551639811b Merge and resolve conflicts

2021-06-30 12:29:13 +05:30

..

css

Merge and resolve conflicts

2021-06-30 12:29:13 +05:30

fonts

Update Inter font to v3.18

2021-04-09 17:41:54 +01:00

img

Merge and resolve conflicts

2021-06-30 12:29:13 +05:30

media

move default ringtones over from riot-web

2018-04-12 00:25:36 +01:00

themes

Merge pull request #5786 from DantrazTrev/DialPad

2021-06-23 11:41:41 +01:00