Merge branch 'jryans/remove-brand' into 'element'
Move config files, update brand See merge request new-vector/element/element-web/element-web!3
This commit is contained in:
commit
8d0f57d62d
|
@ -1,11 +1,12 @@
|
||||||
This directory contains the config files and deployment scripts for the official
|
This directory contains the config files and deployment scripts for the official
|
||||||
riot.im distribution of Riot Web at https://riot.im.
|
element.io distribution of Element Web.
|
||||||
|
|
||||||
You probably do not want to build with this config unless you're building the
|
You probably do not want to build with this config unless you're building the
|
||||||
official riot.im distribution, but these files may be useful if you want to
|
official element.io distribution, but these files may be useful if you want to
|
||||||
inspect the configuration used there.
|
inspect the configuration used there.
|
||||||
|
|
||||||
Riot Desktop uses a separate config (see https://github.com/vector-im/riot-desktop/tree/develop/riot.im).
|
Element Desktop uses a separate config (see
|
||||||
|
https://github.com/vector-im/riot-desktop/tree/develop/element.io).
|
||||||
|
|
||||||
Deployment scripts (such as app/deploy.py) are meant to be run on the web server
|
Deployment scripts (such as app/deploy.py) are meant to be run on the web server
|
||||||
hosting the Riot installation.
|
hosting the Element installation.
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"default_server_name": "matrix.org",
|
"default_server_name": "matrix.org",
|
||||||
"brand": "Riot",
|
"brand": "Element",
|
||||||
"integrations_ui_url": "https://scalar.vector.im/",
|
"integrations_ui_url": "https://scalar.vector.im/",
|
||||||
"integrations_rest_url": "https://scalar.vector.im/api",
|
"integrations_rest_url": "https://scalar.vector.im/api",
|
||||||
"integrations_widgets_urls": [
|
"integrations_widgets_urls": [
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"default_server_name": "matrix.org",
|
"default_server_name": "matrix.org",
|
||||||
"brand": "Riot",
|
"brand": "Element",
|
||||||
"integrations_ui_url": "https://scalar-staging.vector.im/",
|
"integrations_ui_url": "https://scalar-staging.vector.im/",
|
||||||
"integrations_rest_url": "https://scalar-staging.vector.im/api",
|
"integrations_rest_url": "https://scalar-staging.vector.im/api",
|
||||||
"integrations_widgets_urls": [
|
"integrations_widgets_urls": [
|
Loading…
Reference in New Issue