diff options
| author | Eric Eastwood <erice@element.io> | 2022-09-14 18:14:17 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-09-14 18:14:17 -0500 |
| commit | dab846568de09742c038a9a5a5ed00539ff5aa38 (patch) | |
| tree | ef4220faa96569d1d8d5f386c92bb4df2655eeed /synapse/static | |
| parent | Add changelog (diff) | |
| parent | Keep track when we try and fail to process a pulled event (#13589) (diff) | |
| download | synapse-github/madlittlemods/event_id_always_failed_to_fetch.tar.xz | |
Merge branch 'develop' into madlittlemods/event_id_always_failed_to_fetch github/madlittlemods/event_id_always_failed_to_fetch madlittlemods/event_id_always_failed_to_fetch
Conflicts: synapse/handlers/federation_event.py
Diffstat (limited to 'synapse/static')
| -rw-r--r-- | synapse/static/client/login/index.html | 3 | ||||
| -rw-r--r-- | synapse/static/client/register/index.html | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/static/client/login/index.html b/synapse/static/client/login/index.html index 9e6daf38ac..40510889ac 100644 --- a/synapse/static/client/login/index.html +++ b/synapse/static/client/login/index.html @@ -3,7 +3,8 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title> Login </title> - <meta name='viewport' content='width=device-width, initial-scale=1, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0'> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link rel="stylesheet" href="style.css"> <script src="js/jquery-3.4.1.min.js"></script> <script src="js/login.js"></script> diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 140653574d..27bbd76f51 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -2,7 +2,8 @@ <html> <head> <title> Registration </title> -<meta name='viewport' content='width=device-width, initial-scale=1, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0'> +<meta http-equiv="X-UA-Compatible" content="IE=edge"> +<meta name="viewport" content="width=device-width, initial-scale=1.0"> <link rel="stylesheet" href="style.css"> <script src="js/jquery-3.4.1.min.js"></script> <script src="https://www.recaptcha.net/recaptcha/api/js/recaptcha_ajax.js"></script> |