diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-04-09 11:40:14 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-04-09 11:45:08 +0200 |
| commit | ce12934f5b1804cc144014d9d0a93fdd16d13bf1 (patch) | |
| tree | e6cb0c166392c28b38d86abe8f27344ce1d7752f /app/javascript/mastodon/initial_state.js | |
| parent | ff168ef2024626f37fa776fde5739dcd58ecb9f2 (diff) | |
| parent | 99e3e152cd2180cfa9a5bcafae208d44f31078f8 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.
Diffstat (limited to 'app/javascript/mastodon/initial_state.js')
| -rw-r--r-- | app/javascript/mastodon/initial_state.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js index af022e16b..56b2f4eb2 100644 --- a/app/javascript/mastodon/initial_state.js +++ b/app/javascript/mastodon/initial_state.js @@ -55,7 +55,7 @@ * @property {boolean=} delete_modal * @property {boolean=} disable_swiping * @property {string=} disabled_account_id - * @property {boolean} display_media + * @property {string} display_media * @property {string} domain * @property {boolean=} expand_spoilers * @property {boolean} limited_federation_mode |