Age | Commit message (Collapse) | Author |
|
Fixes #20111
|
|
* Add `sensitized` to Admin::Account serializer (fix #19148)
* remove whitespace, please linter
|
|
* Make account endorsements idempotent (fix #19045)
* Accept suggestion to use exists? instead of find_by + nil check
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
* fix logic (unless, not if)
* switch to using `find_or_create_by!`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
|
|
|
|
(#20108)
Fixes #19751
|
|
|
|
Switch to monkey-patching http.rb rather than a runtime extend of each
response, so as to avoid busting the global method cache. A guard is
included that will provide developer feedback in development and test
environments should the monkey patch ever collide.
|
|
Fixes #20067
Our password autocomplete hints were “off” but that does not prevent current
browsers from trying to autocomplete them anyway, so use `current-password` and
`new-password` so they don't put a newly-generated password in a password
confirmation prompt, or the old password for a password renewal prompt.
|
|
(#19983)
Fixes #19915
|
|
`Array#min` (#19906)
* Technically `if`/`else` is faster than using `[value1, value2].compact.min` to find the lesser of two values, one of which may be `nil`.
|
|
* Updating status__content__spoiler-link css for mastodon-light theme to ensure correct rendering precedence
* Adding focus css selector to status__content__spoiler-link mastodon-light theme
* reformatting code to match convention of having css selectors on separate lines
* fixing code format for scss linting issue
|
|
* Fix followers count not being updated when migrating follows
Fixes #19900
* Fix validation error in SynchronizeFeaturedTagsCollectionWorker
Also saves remote user's chosen case for hashtags
* Limit remote featured tags before validation
|
|
|
|
* Since `acct` is split by `@` and assigned to `username` and `domain`, we only need to split `acct` into two Strings.
|
|
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Icelandic)
* New translations en.yml (Japanese)
* New translations en.yml (Armenian)
* New translations en.yml (German)
* New translations en.yml (Czech)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Ido)
* New translations en.json (Esperanto)
* New translations en.yml (Turkish)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Romanian)
* New translations en.yml (Hungarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Catalan)
* New translations en.yml (Danish)
* New translations en.yml (Greek)
* New translations en.yml (Frisian)
* New translations en.yml (Basque)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations en.yml (Irish)
* New translations en.yml (Hebrew)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Asturian)
* New translations en.yml (Occitan)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Corsican)
* New translations en.yml (Malayalam)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Burmese)
* New translations en.yml (Breton)
* New translations en.yml (Tatar)
* New translations en.yml (Indonesian)
* New translations en.yml (Kazakh)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Croatian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Estonian)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.yml (Uyghur)
* New translations en.yml (Igbo)
* New translations en.json (Czech)
* New translations en.json (Dutch)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Dutch)
* New translations en.yml (Polish)
* New translations en.yml (Swedish)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.json (Dutch)
* New translations en.yml (Ukrainian)
* New translations en.yml (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Irish)
* New translations simple_form.en.yml (Asturian)
* New translations devise.en.yml (Asturian)
* New translations en.json (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Asturian)
* New translations activerecord.en.yml (Asturian)
* New translations devise.en.yml (Asturian)
* New translations en.json (Japanese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations en.json (Afrikaans)
* New translations en.json (Galician)
* New translations en.yml (Turkish)
* New translations en.json (Afrikaans)
* New translations en.yml (Afrikaans)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Afrikaans)
* New translations en.json (Albanian)
* New translations en.yml (Albanian)
* New translations en.yml (French)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Slovenian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Albanian)
* New translations activerecord.en.yml (French)
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (French)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Occitan)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations activerecord.en.yml (Occitan)
* New translations en.yml (Spanish)
* New translations en.yml (Japanese)
* New translations en.json (Occitan)
* New translations en.json (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Occitan)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.json (Irish)
* New translations en.json (Slovenian)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Thai)
* New translations en.json (German)
* New translations en.yml (Spanish)
* New translations en.json (Greek)
* New translations en.json (Slovenian)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Asturian)
* New translations en.json (Danish)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Korean)
* New translations en.json (French)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.json (Ukrainian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations en.json (German)
* New translations en.json (Catalan)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Spanish, Mexico)
* New translations en.json (Asturian)
* New translations en.json (Occitan)
* New translations doorkeeper.en.yml (Catalan)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations en.json (German)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (French)
* New translations en.yml (Dutch)
* New translations en.json (Welsh)
* New translations en.json (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations en.json (Dutch)
* New translations en.json (French)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (German)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Arabic)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations activerecord.en.yml (Ukrainian)
* New translations en.json (Russian)
* New translations en.json (Bulgarian)
* New translations en.json (Hebrew)
* New translations en.json (Bulgarian)
* New translations en.json (Japanese)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Japanese)
* New translations devise.en.yml (Finnish)
* New translations en.json (Hebrew)
* New translations en.yml (German)
* New translations en.json (Bulgarian)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Japanese)
* New translations activerecord.en.yml (Arabic)
* New translations activerecord.en.yml (Hebrew)
* New translations en.json (Bulgarian)
* New translations en.json (German)
* New translations en.json (Danish)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.json (Bulgarian)
* New translations en.json (Frisian)
* New translations en.json (Russian)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Russian)
* New translations devise.en.yml (Frisian)
* New translations en.yml (Czech)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Frisian)
* New translations en.json (Italian)
* New translations en.json (Polish)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
Fixes #19920
|
|
Fixes #19913
|
|
Most of the old routes are broken because of the /web removal.
|
|
* Add form element on focal point modal
* Add type="button" for detection button
|
|
Fixes #19900
|
|
This is modeled on #19833, and based on the attribute values documented
in https://developer.apple.com/documentation/security/password_autofill/enabling_password_autofill_on_an_html_input_element?language=objc
|
|
|
|
|
|
* Fix JavaScript console error on Getting Started column
* Update app/javascript/mastodon/components/column_header.js
Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
|
|
|
|
|
|
|
|
The email address will be used as the "username" for sign-in purposes, so it's the value that should be stored in password managers. We can inform the password manager of this by setting `autocomplete="email"`. Without this hint, password managers may instead store the `username` field, which isn't valid for sign-in (this happens with iCloud Keychain in Safari, for instance).
|
|
|
|
|
|
New environment variable `DISALLOW_UNAUTHENTICATED_API_ACCESS`
|
|
Fix #19646
|
|
|
|
|
|
(#19788)
|
|
|
|
|
|
|
|
|
|
|
|
* Fix compose form submission reloading web interface
Fix regression introduced by #19742
* Fix various compose form buttons being handled like submit buttons
* Fix coding style issue
* Fix missing onClick prop check
|
|
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Armenian)
* New translations en.yml (Irish)
* New translations en.json (Thai)
* New translations en.json (Sinhala)
* New translations en.json (Bulgarian)
* New translations en.json (Ido)
* New translations en.json (German)
* New translations en.json (Tamil)
* New translations en.json (Esperanto)
* New translations en.json (Czech)
* New translations en.json (Dutch)
* New translations en.json (Albanian)
* New translations en.json (Japanese)
* New translations en.json (Indonesian)
* New translations en.json (Romanian)
* New translations en.json (Irish)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Catalan)
* New translations en.json (Danish)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Corsican)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Sardinian)
* New translations en.json (Breton)
* New translations en.json (Sanskrit)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations en.json (Burmese)
* New translations en.json (Cornish)
* New translations en.json (Malayalam)
* New translations en.json (Persian)
* New translations en.json (Estonian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.json (Latvian)
* New translations en.json (Tatar)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Welsh)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Japanese)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.json (Portuguese)
* New translations en.json (Chinese Simplified)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations activerecord.en.yml (Irish)
* New translations devise.en.yml (Irish)
* New translations en.json (Greek)
* New translations en.json (Irish)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Chinese Traditional)
* New translations en.json (Galician)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.json (Italian)
* New translations en.json (Vietnamese)
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Esperanto)
* New translations en.json (Albanian)
* New translations en.json (Indonesian)
* New translations en.json (Icelandic)
* New translations en.yml (Indonesian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* New translations en.json (Slovenian)
* New translations en.json (Turkish)
* New translations en.json (Vietnamese)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (German)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.json (Breton)
* New translations en.json (Dutch)
* New translations en.json (Spanish)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Hungarian)
* New translations en.json (French)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Afrikaans)
* New translations en.json (Catalan)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Indonesian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations en.json (Persian)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Italian)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.json (Irish)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Ukrainian)
* New translations activerecord.en.yml (Irish)
* New translations en.json (Polish)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Dutch)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Swedish)
* New translations doorkeeper.en.yml (Swedish)
* New translations activerecord.en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Afrikaans)
* New translations en.yml (Afrikaans)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Norwegian Nynorsk)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Swedish)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Polish)
* New translations en.json (Swedish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Czech)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
|
|
* Spare one SQL query when hydrating polls
* Improve tests
* Fix more discrepancies
* Fix possible crash when the status has no application set
|
|
- Improve tests
- Fix possible crash when application of a reblogged post isn't set
- Fix discrepancies around favourited and reblogged attributes
- Fix discrepancies around pinned attribute
- Fix polls not being hydrated
|
|
|
|
|
|
|
|
|