aboutsummaryrefslogtreecommitdiffstats
path: root/resources/lib
Commit message (Collapse)AuthorAgeFilesLines
* Upgrade moment from v2.25.2 to v2.30.1James D. Forrester2025-04-06116-1348/+2498
| | | | | | | | | | Five new locales, two of which map to supported languages in core (ku-kmr -> ku, and tk -> tk), and three of which don't but are added in for future support and for languages that might be configured in production systems (ar-ps, bn-bd, and es-mx). Bug: T389416 Change-Id: Ic69ddf92f922515bf36a2ea1770b2c8ebd2c46b2
* Update Codex from v1.21.1 to v1.22.0Eric Gardner2025-04-0128-47/+76
| | | | | | | | | | | | Bug: T310158 Bug: T386298 Bug: T386482 Bug: T388049 Bug: T388857 Bug: T389234 Bug: T390589 Bug: T390615 Change-Id: I1325618ae8ccd554f8f0891abe6a51df539ab6da
* Update Codex from v1.20.3 to v1.21.1Anne Tomasevich2025-03-2032-251/+997
| | | | | | | | | | | | | | | | | Bug: T373222 Bug: T386152 Bug: T386482 Bug: T386485 Bug: T386997 Bug: T387217 Bug: T387218 Bug: T387867 Bug: T388709 Bug: T388710 Bug: T388831 Bug: T388835 Bug: T389094 Change-Id: Idd564f5720960a9376f6d83a25d19a42e9c50f19
* Update OOUI to v0.51.7James D. Forrester2025-03-1722-68/+89
| | | | | | | | Release notes: https://gerrit.wikimedia.org/g/oojs/ui/+/v0.51.7/History.md Depends-On: Ide3e140beb9affe3a1bd4bdc91da636065877926 Change-Id: Ie09af553957d3c19ab3b458716c5261f56766915
* Update Codex from v1.20.2 to v1.20.3lwatson2025-03-0414-41/+79
| | | | | | | | | | | | | | | | | | Bug: T373218 Bug: T373219 Bug: T383867 Bug: T386148 Bug: T386150 Bug: T386151 Bug: T386300 Bug: T386481 Bug: T386485 Bug: T386621 Bug: T387536 Bug: T387601 Bug: T387757 Bug: T387911 Change-Id: If664d2c3a8fde00f8012a03a53436db8b943558b
* Update OOUI to v0.51.6Volker E.2025-02-2122-119/+111
| | | | | | | | | | | | Release notes: https://gerrit.wikimedia.org/g/oojs/ui/+/v0.51.6/History.md Bug: T306486 Bug: T365759 Bug: T385507 Bug: T385667 Depends-On: Ie9cf6edc0da6d7a2dbc62d3a02eee0a192f266cd Change-Id: Ic65c2876789dff92409ef803f6957a6c6db5279a
* Update Codex from v1.20.1 to v1.20.2Volker E.2025-02-1938-491/+613
| | | | | | | | | | | | | | | Bug: T364401 Bug: T383105 Bug: T383642 Bug: T383907 Bug: T383909 Bug: T384519 Bug: T385068 Bug: T385484 Bug: T385667 Bug: T386412 Bug: T386541 Change-Id: I9d488afbce55efced43096b345b92c8636e9efac
* Update Codex from v1.20.0 to v1.20.1Anne Tomasevich2025-02-0438-59/+147
| | | | | | | | | | | | Bug: T358544 Bug: T365759 Bug: T372748 Bug: T372896 Bug: T382758 Bug: T384056 Bug: T385099 Bug: T385499 Change-Id: Ib99bbb4fd3bf6532ad7f1e0e6f4a4c941fd3592a
* Update OOUI to v0.51.5Volker E.2025-01-2748-129/+236
| | | | | | | | | | | | | | | | | | | | Release notes: https://gerrit.wikimedia.org/g/oojs/ui/+/v0.51.5/History.md Bug: T108491 Bug: T176730 Bug: T196900 Bug: T365759 Bug: T371140 Bug: T377073 Bug: T381136 Bug: T381823 Bug: T383086 Bug: T383115 Bug: T383277 Bug: T383337 Depends-On: I1ad5c991429122e01f67adc09b25d8322af925f0 Change-Id: Icd7e5aa7bf0735c905e9ec5ab0da7a7298d71400
* build: Update QUnit from 2.23.1 to 2.24.1Timo Tijhof2025-01-264-107/+169
| | | | | | | | | | Highlights from https://qunitjs.com/blog/ * Cleaner stack traces for uncaught errors. * Fix TAP compliance. * Faster "Hide passed" toggling on large test suites. Change-Id: Ia7760b0f84d11c590ca73bce77da2405f411f47d
* Update Codex from 1.19.0 to 1.20.0Eric Gardner2025-01-2379-355/+392
| | | | | | | | | | | | | | | | | | | | Bug: T309109 Bug: T309669 Bug: T335089 Bug: T346320 Bug: T349283 Bug: T355083 Bug: T358062 Bug: T371140 Bug: T372896 Bug: T374140 Bug: T380942 Bug: T381775 Bug: T383091 Bug: T383113 Bug: T383115 Bug: T383337 Change-Id: I6722d3244f9a4494eded4b6ad50b743c860e7a0d
* Merge "Commit swagger-ui's NOTICE"jenkins-bot2025-01-152-0/+3
|\
| * Commit swagger-ui's NOTICEKunal Mehta2025-01-152-0/+3
| | | | | | | | | | | | | | | | | | | | | | It contains the copyright statement that accompanies the LICENSE. This doesn't not address the concerns in T382086, which is that swagger-ui bundles other projects without retaining their copyright statements, but gets us one step closer by including at least some information. Change-Id: I11e80abee385576e7e0350bd5d7a43758d2b2e92
* | Update Vue to 3.5.13Roan Kattouw2025-01-105-3857/+5232
|/ | | | | Bug: T374140 Change-Id: I2eb9c817d4d392a58de2edb7019e4be33db5e4bd
* Update Codex to 1.19.1Roan Kattouw2025-01-0741-1329/+1393
| | | | | | | | | | | | | | | Also update Vue from 3.4.27 to 3.4.28, required by Codex 1.19.x. We'll update to Vue 3.5 soon (and also fix the issue that requires Codex and Vue to be updated in the same commit). Bug: T317792 Bug: T379299 Bug: T381798 Bug: T382175 Bug: T382391 Bug: T383073 Bug: T383080 Change-Id: I4d4ac2f18d9d314347f58646ecfff8257d7b7ade
* build: Update qunit from 2.20.0 to 2.23.1Timo Tijhof2024-12-284-1472/+1741
| | | | | | | | | | Highlights from https://github.com/qunitjs/qunit/blob/2.23.1/History.md * Add `assert.closeTo()`. https://qunitjs.com/api/assert/closeTo/ * Add `QUnit.test.if()` and `QUnit.module.if()`. https://qunitjs.com/api/QUnit/test.if/ Change-Id: I23e33feafdb22becc0247cba5ea56767c1b9b6c1
* Update Codex from v1.17.0 to v1.18.0lwatson2024-12-1062-127/+259
| | | | | | | | | | | | Bug: T303384 Bug: T314514 Bug: T341978 Bug: T342126 Bug: T370889 Bug: T380452 Bug: T381787 Depends-On: I58401027164c50a7eab694789597678e13392561 Change-Id: I2b1a13084d2d4369f7af8d17595d0b2f4def511b
* Update OOUI to v0.51.4Eric Gardner2024-12-0527-49/+94
| | | | | | | | | | | Release notes: https://gerrit.wikimedia.org/g/oojs/ui/+/v0.51.4/History.md Bug: T377370 Bug: T380198 Bug: T381341 Bug: T381542 Depends-On: I8f0fabfe21e23b53707436c6636f86a31e91040f Change-Id: I12d5e4eb22d7607e73a080b19ba456d25c0e04fd
* Update Codex from v1.16.0 to v1.17.0Eric Gardner2024-11-2733-429/+668
| | | | | | | | | | | | Bug: T342126 Bug: T370446 Bug: T378024 Bug: T378025 Bug: T378425 Bug: T380198 Bug: T380759 Bug: T380760 Change-Id: I7625e335b67073d3f6225025048f339dbc182603
* Update Codex from v1.15.0 to v1.16.0Anne Tomasevich2024-11-1359-147/+304
| | | | | | | | | | | | | | Bug: T368629 Bug: T368938 Bug: T369838 Bug: T370886 Bug: T375827 Bug: T377977 Bug: T378177 Bug: T379004 Bug: T379636 Depends-On: If0108af217294bafe356072c7b13da00b99619d8 Change-Id: Ia8135a1a3e4fe9e9fac47418df43baeced36d8c4
* Update OOUI to v0.51.2Anne Tomasevich2024-11-1331-85/+165
| | | | | | | | | | Release notes:https://gerrit.wikimedia.org/g/oojs/ui/+/v0.51.2/History.md Bug: T210534 Bug: T324382 Bug: T376276 Depends-On: I50ec27302347203170cb14c7228b6c3d3264b24c Change-Id: Iea7cbc00d988504660754e8728707d0021ae37d7
* Update Codex from v1.14.0 to v1.15.0Eric Gardner2024-10-2976-324/+544
| | | | | | | | | | | | | | | | | | | | | | Bug: T305036 Bug: T341357 Bug: T370132 Bug: T370446 Bug: T372000 Bug: T373200 Bug: T373872 Bug: T374454 Bug: T375383 Bug: T376070 Bug: T376135 Bug: T376641 Bug: T376642 Bug: T376644 Bug: T378191 Bug: T378366 Change-Id: Ibaddd124bdaaacb399ae34f72ad3917299766959 Depends-On: Ib2a9ee811f9672b5bffaf2263fbc6fc37d806d59
* Update Codex from v1.13.1 to v1.14.0lwatson2024-10-1628-125/+555
| | | | | | | | | | | | | Bug: T362650 Bug: T370057 Bug: T371118 Bug: T374659 Bug: T374882 Bug: T375699 Bug: T375700 Bug: T376024 Bug: T376622 Change-Id: I18684997862a1a6427627d8061a2583fff00e621
* Update Codex from v1.13.0 to v1.13.1Anne Tomasevich2024-10-0117-103/+149
| | | | | | | | | Bug: T322014 Bug: T362346 Bug: T373225 Bug: T375698 Bug: T376045 Change-Id: I48c5a0e781fb10893adf63921124df23587b83ad
* Update OOUI to v0.51.1lwatson2024-09-1931-148/+216
| | | | | | | | | | | Release notes: https://gerrit.wikimedia.org/g/oojs/ui/+/v0.51.1/History.md Bug: T374858 Bug: T371201 Bug: T371466 Bug: T373226 Depends-On: I3663e72f4f1dbb6dd0b461b5a2464420937d3ed6 Change-Id: Ic8f80b0db5a08f00d9178163b1fbbb79515c1603
* Update Codex from v1.12.0 to v1.13.0lwatson2024-09-1767-339/+396
| | | | | | | | | | | | | | | | Bug: T251790 Bug: T360494 Bug: T363515 Bug: T365779 Bug: T370493 Bug: T371998 Bug: T372433 Bug: T372928 Bug: T373437 Bug: T374246 Bug: T374378 Change-Id: I1106330843660978bd917fe5ab7ce2e23226d3ee
* resources: Fix 404 Not Found for foreign Financial-Times/polyfill-libraryTimo Tijhof2024-09-162-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/Financial-Times/polyfill-library/ is now a 404. It was transferred with redirect to https://github.com/JakeChampion/polyfill-library/ but that has since been deleted. https://github.com/mrhenry/polyfill-library/ is a reasonable-looking fork that includes full history, and so this is an easy no-op to fix CI for REL1_39 and later. == Background (Extended version) == * The library was created by Andrew Betts at the Financial Times, at https://github.com/Financial-Times/polyfill-library/. * At some later point a web service was created around that library, committed to the same repo, served from a domain that has unclear ownership. https://sansec.io/research/polyfill-supply-chain-attack https://twitter.com/triblondon/status/1761852117579427975 * In 2018, JakeChampion renamed the repo to polyfill-service, and splitt off the library into a separate repo with no prior history. The pre-2018 history is preserved in the polyfill-service repo. https://github.com/mrhenry/polyfill-library/tree/acf4e6c36d0baafdd14bbc08a2d2690f0e8fcd0d https://github.com/cdnjs/polyfill-service/tree/165879244964dc8daac9222b44332629eb1dd0ac/packages * In 2022, Krinkle had a patch merged that fixed a bug affecting MediaWiki. After which, we adopted the polfill. This was merged after polyfill-library 3.111.0 was released. https://github.com/mrhenry/polyfill-library/commit/0ece79ce32 * In 2023, someone transferred the "library" repo from https://github.com/Financial-Times/polyfill-library/ to https://github.com/JakeChampion/polyfill-library/. * In Feb 2024, the polyfill.io "service" appears to have been sold to a Chinese company, which subsequently utilized it to spread malicious code as part of a cyberattack. It also created its own flat single-commit copy of the library with no prior history, versioning, or other auditability. https://sansec.io/research/polyfill-supply-chain-attack https://snyk.io/blog/polyfill-supply-chain-attack-js-cdn-assets/ https://github.com/polyfillpolyfill/polyfill-library/ * Some days after 4 Aug 2024, the official "library" repo was deleted from the JakeChampion account. This means the "polyfill-library" npm package no longer has a reachable Git upstream, since its source control url (Financial-Times/polyfill-library) is now no longer a redirect to JakeChampion/polyfill-library. Both are 404. https://web.archive.org/web/%2A/https://github.com/JakeChampion/polyfill-library https://www.npmjs.com/package/polyfill-library * Fastly and Cloudflare both have their own forks with recent changes scrubbed. However, these have vendored and versioned copies of the polyfill-library library. Thus no history of these libs themselves, and do not accept patched for the actual code being served, only for the web service. They both go up to 3.111.0 (which is a few commits before the URL.js that we have, and misses critical bug fixes Krinkle submitted to Financial-Times) and after that have 4.8.0 which includes our fixes and one other minor change to URL.js. We could use that as our foreign source, but the downside is that it isn't a proper upstream given it's merely a distribution, not open to patches or bug reports. Their source is the npm package, which has now dead/frozen. https://github.com/fastly/polyfill-service/ https://github.com/cdnjs/polyfill-service/ * Of the various polyfill-library forks, only one seems to meet these criteria: - Includes full history. - Published to npm. - Responsive to bug reports and made subsequent releases. https://github.com/mrhenry/polyfill-library/ https://github.com/cdnjs/polyfill-service/issues/4 So, for now, given that this is a no-op, use that as our remote. Change-Id: Ia59a5e9790cbdc7b03d4ae66583fe328fbd05f53
* Update Codex from v1.11.1 to v1.12.0Eric Gardner2024-09-0467-100/+1036
| | | | | | | | | | | | | | | | Bug: T362651 Bug: T363515 Bug: T364441 Bug: T366831 Bug: T367032 Bug: T368022 Bug: T370504 Bug: T370997 Bug: T372419 Bug: T372420 Bug: T372614 Bug: T372811 Change-Id: I76a81086e4451383d3df839f8640f09744c8172c
* Update Codex from v1.11.0 to v1.11.1Roan Kattouw2024-08-2025-124/+316
| | | | | | | | | | | | | Bug: T314446 Bug: T365178 Bug: T366326 Bug: T370447 Bug: T370689 Bug: T371330 Bug: T371529 Bug: T372735 Bug: T372796 Change-Id: I904e19f3d58b4c1ec6c12c91992e81d77e463034
* CodexModule: use list of i18n message keys from Codex packageEric Gardner2024-08-121-0/+23
| | | | | | | | | | | | | | | | Previously, ResourceLoader's CodexModule class was using a hard-coded list of message keys to add to the payload any time Codex components get used. But now we can get the list of messages directly from Codex. This change replaces the hardcoded list of strings with a call to file_get_contents(). The list of messages is defined in a file called "messageKeys.json" in the Codex package. In the next release of Codex, this file will be pulled in via foreign-resources.yml; for now it has been added manually to the Codex files in resources/lib. Bug: T371330 Change-Id: Ib7ca66d67153dfba72d8d49b0181d49b007eedce
* Update Codex from v1.10.0 to v1.11.0Eric Gardner2024-08-0833-361/+963
| | | | | | | | | | | | | | Bug: T360154 Bug: T363416 Bug: T369934 Bug: T370032 Bug: T370445 Bug: T370959 Bug: T371318 Bug: T371330 Bug: T371628 Bug: T371851 Change-Id: Iffa31b7640d93abc022bbb1bc18269afa3e48e5b
* ForeignResourceManager: Write CDX file to diskGergő Tisza2024-08-081-0/+647
| | | | | | | | | | * Make 'manageForeignResources.php make-cdx' write the CycloneDX file to resources/lib/foreign-resources.cdx.json. * Commit resources/lib/foreign-resources.cdx.json * Add a structure test to ensure it is up to date. Bug: T363589 Change-Id: I1e9d53590d4e7f0577d21cd51d777daf62d1f589
* Update Codex from v1.9.0 to v1.10.0lwatson2024-07-2521-48/+122
| | | | | | | | | | | | | Bug: T314438 Bug: T364442 Bug: T369223 Bug: T369633 Bug: T369934 Bug: T370189 Bug: T370555 Change-Id: Ic13f3b6fc62522830b1cf118f6052872d88d52a2 Depends-On: Ie236c633c3cfa181f81360daa3c1ceeca7f669ec
* Merge "Update Codex from 1.8.0 to 1.9.0"jenkins-bot2024-07-1225-199/+347
|\
| * Update Codex from 1.8.0 to 1.9.0Volker E.2024-07-1125-199/+347
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: T358246 Bug: T363940 Bug: T366129 Bug: T367467 Bug: T367762 Bug: T367792 Bug: T368442 Bug: T368443 Bug: T369529 Depends-On: Ie642f038ef4b143166a574248ac936c78adae23e Change-Id: Ib1dc0dabdfbd1b92efdd723c0c2f2d625aeb6e7a
* | Update OOUI to v0.50.4Volker E.2024-07-1222-65/+108
|/ | | | | | | | | Release notes: https://gerrit.wikimedia.org/g/oojs/ui/+/v0.50.4/History.md Bug: T369597 Bug: T369666 Depends-On: I23ed96557e0c1b30528fd7c4d81ade8dfd5be80e Change-Id: I384eeead649dfa81c1dacf2fc461a2be515256d5
* Update jquery.i18n from 1.0.7 to 1.0.10Winston Sung2024-07-0310-44/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: T117845 Bug: T137376 Bug: T137411 Bug: T169436 Bug: T185421 Bug: T193566 Bug: T237672 Bug: T245359 Bug: T254854 Bug: T278639 Bug: T333425 Bug: T338416 Bug: T341545 Bug: T343865 Bug: T348376 Bug: T349093 Bug: T351724 Bug: T354519 Bug: T354926 Bug: T354937 Bug: T362041 Bug: T364291 Bug: T367991 Change-Id: I63c08002a936a07d1256e603aad213eb7c54955f
* Update OOUI to v0.50.3James D. Forrester2024-07-0217-35/+53
| | | | | | | | | Release notes: https://gerrit.wikimedia.org/g/oojs/ui/+/v0.50.3/History.md Bug: T369010 Depends-On: I41956b4648091c963ad92be2d5cb2bce55ff33d9 Change-Id: Id737a60b14d87a074f914130cab0d5874134749f
* Update OOUI to v0.50.2Volker E.2024-06-2823-189/+270
| | | | | | | | Release notes: https://gerrit.wikimedia.org/g/oojs/ui/+/v0.50.2/History.md Depends-On: Ie64bd223108b5442ea9194ce78224685f45009d4 Change-Id: I6b928e6624109a0740707325e363a919489eb5a2
* Update Codex from 1.7.0 to 1.8.0Eric Gardner2024-06-2562-246/+593
| | | | | | | | | | | | | | | | | Also adds @size-tooltip and @background-color-inverted to mediawiki.skin.defaults.less. Bug: T308520 Bug: T340456 Bug: T349793 Bug: T364306 Bug: T366129 Bug: T366541 Bug: T366861 Bug: T367098 Bug: T367100 Bug: T367101 Change-Id: Ie06bf3e15e55272f0ebecfebe4baa9564fa804df
* Merge "Add Special:RestSandbox for exploring REST API"jenkins-bot2024-06-149-0/+330
|\
| * Add Special:RestSandbox for exploring REST APIdaniel2024-06-139-0/+330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Special:RestSandbox presents a Swagger-UI interface for exploring REST APIs. The available APIs can be configured using RestSandboxSpecs. For now, the default is to support no APIs, so the feature is disabled in production. In the future, it would make sense to expose the wiki's own REST API per default. The corresponding entry in $wgRestSandboxSpecs in LocalSettings.php would look like this: 'mw' => [ 'url' => $wgScriptPath . '/rest.php/', 'name' => 'MediaWiki REST API', ] Note that the spec URL may still change. To also explore the endpoints exposed through RESTbase, we might add: 'wmf-restbase' => [ 'url' => $wgServer . '/api/rest_v1/', 'name' => 'Wikimedia RESTbase API', ] Similarly, we could expose a spec for endpoints on api.wikimedia.org, which could then be explored using the new special page. NOTE: This adds a dependency on the swagger-ui npm library. See T325558 for the security review. Bug: T362006 Change-Id: I1dd5ed82680a28f9c15136b446a2de0398525061
* | Update OOUI to v0.50.0Roan Kattouw2024-06-1222-543/+509
| | | | | | | | | | | | | | | | | | | | Release notes: https://gerrit.wikimedia.org/g/oojs/ui/+/v0.50.0/History.md Bug: T367061 Bug: T364777 Bug: T365759 Depends-On: Ib183cd7c28ea3fb68a6614b38362325560b426f8 Change-Id: I8427c2ebe487e914764c1b42991545edbe112ae0
* | foreign-resources: Update name of the Design System teamRoan Kattouw2024-06-111-3/+3
| | | | | | | | | | | | | | The team listed as the authors of Codex was renamed from Design Systems (plural) to Design System (singular). Change-Id: I1f03f923fcded1c8efde730c72b9b8fa0ac874da
* | Update Codex from v1.6.1 to v1.7.0Roan Kattouw2024-06-1183-369/+597
|/ | | | | | | | | | | | Bug: T361717 Bug: T363741 Bug: T364748 Bug: T365207 Bug: T365748 Bug: T366206 Bug: T366538 Bug: T367062 Change-Id: I792e89a8253a426b8c723486b96cb87bf9e1d85d
* Update Vue.js to 3.4.27Eric Gardner2024-05-294-1864/+3136
| | | | | Bug: T364789 Change-Id: Ib21a5dfdf8fcdd6c090ea74fb052181f0fb90d9e
* Update Codex from v1.6.0 to v1.6.1Anne Tomasevich2024-05-29112-1133/+738
| | | | | | | | | | | | | | | | | | | | | | | | Note that CSS module filenames in this release have an extra 'Cdx' prefix - this is a known bug that will be resolved with the next release. For now, these files are not used directly, and are properly tracked by the manifest, so there should be no discernible changes. See T366206. Bug: T363432 Bug: T363858 Bug: T364611 Bug: T364636 Bug: T364762 Bug: T364789 Bug: T364894 Bug: T364927 Bug: T364929 Bug: T364934 Bug: T365003 Bug: T365363 Bug: T366097 Depends-On: I04c1250aef3afbff43c11a012194263ec6b0f533 Change-Id: I4988a93e8cb0f33c198303403dde8d92223d63c4
* Merge "foreign-resources: Add purl field to vue-demi"jenkins-bot2024-05-221-0/+1
|\
| * foreign-resources: Add purl field to vue-demiSportzpikachu2024-05-221-0/+1
| | | | | | | | | | | | | | | | | | The purl field was merged after the vue-demi patch was created (Ib27ac455). Add the vue-demi package URL to foreign-resources.yaml, in order to be consistent with the other packages from npm. Bug: T363589 Change-Id: I4f98c4bab89d8cf864fdbb24e0187e2b7219fcf2
* | Update OOUI to v0.49.2Volker E.2024-05-1725-438/+371
| | | | | | | | | | | | | | | | | | Release notes: https://gerrit.wikimedia.org/g/oojs/ui/+/v0.49.2/History.md Bug: T364770 Depends-On: Ifa4e4f29e81f270f5a1503ddb2545baac2afeaa5 Change-Id: I52b3f0bb305e2d6c2961c3bb2fae5d66e22addd0