Merge branch 'develop' of github.com:vector-im/riot-web into joriks/delabs-font-scaling
This commit is contained in:
commit
f5209c0d7e
12 changed files with 85 additions and 37 deletions
|
@ -30,8 +30,7 @@
|
|||
"feature_pinning": "labs",
|
||||
"feature_custom_status": "labs",
|
||||
"feature_custom_tags": "labs",
|
||||
"feature_state_counters": "labs",
|
||||
"feature_irc_ui": "labs"
|
||||
"feature_state_counters": "labs"
|
||||
},
|
||||
"default_federate": true,
|
||||
"default_theme": "light",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue