Merge branch 'more-updates' into 'master'

More updates

See merge request agaric/sites/agaric-com!24
This commit is contained in:
Chris Thompson 2018-10-18 05:28:22 +00:00
commit d8119f13c9
5 changed files with 166 additions and 131 deletions

View file

@ -24,7 +24,8 @@
"drupal/redirect": "^1.2", "drupal/redirect": "^1.2",
"drupal/block_theme_sync": "^1.0@alpha", "drupal/block_theme_sync": "^1.0@alpha",
"drupal/search404": "^1.0", "drupal/search404": "^1.0",
"drupal/coffee": "^1.0@beta" "drupal/coffee": "^1.0@beta",
"drupal/twigsuggest": "1.x-dev"
}, },
"repositories": { "repositories": {
"drupal": { "drupal": {

280
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "d6ed4f6cd201fdf33d4e19ec8965247d", "content-hash": "bc5e04f7ae5c73bd21998541499be5cf",
"packages": [ "packages": [
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",
@ -851,19 +851,20 @@
}, },
{ {
"name": "consolidation/output-formatters", "name": "consolidation/output-formatters",
"version": "3.2.1", "version": "3.3.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/consolidation/output-formatters.git", "url": "https://github.com/consolidation/output-formatters.git",
"reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5" "reference": "853d2d462a191d44a25a5593d8fe2c4a1e59e382"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d78ef59aea19d3e2e5a23f90a055155ee78a0ad5", "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/853d2d462a191d44a25a5593d8fe2c4a1e59e382",
"reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5", "reference": "853d2d462a191d44a25a5593d8fe2c4a1e59e382",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"dflydev/dot-access-data": "^1.1.0",
"php": ">=5.4.0", "php": ">=5.4.0",
"symfony/console": "^2.8|^3|^4", "symfony/console": "^2.8|^3|^4",
"symfony/finder": "^2.5|^3|^4" "symfony/finder": "^2.5|^3|^4"
@ -902,7 +903,7 @@
} }
], ],
"description": "Format text by applying transformations provided by plug-in formatters.", "description": "Format text by applying transformations provided by plug-in formatters.",
"time": "2018-05-25T18:02:34+00:00" "time": "2018-10-16T01:14:51+00:00"
}, },
{ {
"name": "consolidation/robo", "name": "consolidation/robo",
@ -3172,16 +3173,16 @@
}, },
{ {
"name": "drupal/core", "name": "drupal/core",
"version": "8.6.1", "version": "8.6.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/drupal/core.git", "url": "https://github.com/drupal/core.git",
"reference": "1c8b96c89288daf4d145c6dbcf1e8f0d0c9d7970" "reference": "356292934802bb1aecc478e88a3cba77442d7c62"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/drupal/core/zipball/1c8b96c89288daf4d145c6dbcf1e8f0d0c9d7970", "url": "https://api.github.com/repos/drupal/core/zipball/356292934802bb1aecc478e88a3cba77442d7c62",
"reference": "1c8b96c89288daf4d145c6dbcf1e8f0d0c9d7970", "reference": "356292934802bb1aecc478e88a3cba77442d7c62",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3406,7 +3407,7 @@
"GPL-2.0-or-later" "GPL-2.0-or-later"
], ],
"description": "Drupal is an open source content management platform powering millions of websites and applications.", "description": "Drupal is an open source content management platform powering millions of websites and applications.",
"time": "2018-09-10T11:50:07+00:00" "time": "2018-10-17T22:19:50+00:00"
}, },
{ {
"name": "drupal/ctools", "name": "drupal/ctools",
@ -5019,17 +5020,17 @@
}, },
{ {
"name": "drupal/entity_reference_revisions", "name": "drupal/entity_reference_revisions",
"version": "1.5.0", "version": "1.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git.drupal.org/project/entity_reference_revisions", "url": "https://git.drupal.org/project/entity_reference_revisions",
"reference": "8.x-1.5" "reference": "8.x-1.6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://ftp.drupal.org/files/projects/entity_reference_revisions-8.x-1.5.zip", "url": "https://ftp.drupal.org/files/projects/entity_reference_revisions-8.x-1.6.zip",
"reference": "8.x-1.5", "reference": "8.x-1.6",
"shasum": "417250a105afe8febef508c7f981d02cb138752d" "shasum": "82d515de04d3a75fb677ed82241a6aff3f54ab47"
}, },
"require": { "require": {
"drupal/core": "~8.0" "drupal/core": "~8.0"
@ -5043,7 +5044,7 @@
"dev-1.x": "1.x-dev" "dev-1.x": "1.x-dev"
}, },
"drupal": { "drupal": {
"version": "8.x-1.5", "version": "8.x-1.6",
"datestamp": "1539588781", "datestamp": "1539588781",
"security-coverage": { "security-coverage": {
"status": "covered", "status": "covered",
@ -5941,17 +5942,17 @@
}, },
{ {
"name": "drupal/redirect", "name": "drupal/redirect",
"version": "1.2.0", "version": "1.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git.drupal.org/project/redirect", "url": "https://git.drupal.org/project/redirect",
"reference": "8.x-1.2" "reference": "8.x-1.3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.2.zip", "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.3.zip",
"reference": "8.x-1.2", "reference": "8.x-1.3",
"shasum": "ac503fbfbd15523c65f38d8b326e5f2159683cdb" "shasum": "3f9620d186e25f36ac56755979932b8ea965b8c7"
}, },
"require": { "require": {
"drupal/core": "~8" "drupal/core": "~8"
@ -5962,8 +5963,8 @@
"dev-1.x": "1.x-dev" "dev-1.x": "1.x-dev"
}, },
"drupal": { "drupal": {
"version": "8.x-1.2", "version": "8.x-1.3",
"datestamp": "1525419785", "datestamp": "1539682684",
"security-coverage": { "security-coverage": {
"status": "covered", "status": "covered",
"message": "Covered by Drupal's security advisory policy" "message": "Covered by Drupal's security advisory policy"
@ -5982,6 +5983,10 @@
{ {
"name": "Dave Reid", "name": "Dave Reid",
"homepage": "https://www.drupal.org/user/53892" "homepage": "https://www.drupal.org/user/53892"
},
{
"name": "pifagor",
"homepage": "https://www.drupal.org/user/2375692"
} }
], ],
"description": "Allows users to redirect from old URLs to new URLs.", "description": "Allows users to redirect from old URLs to new URLs.",
@ -6380,6 +6385,48 @@
"source": "http://cgit.drupalcode.org/token" "source": "http://cgit.drupalcode.org/token"
} }
}, },
{
"name": "drupal/twigsuggest",
"version": "dev-1.x",
"source": {
"type": "git",
"url": "https://git.drupal.org/project/twigsuggest",
"reference": "7d80565d23d0a1d4a68c82a9f65d6dede546c209"
},
"require": {
"drupal/core": "~8.0"
},
"type": "drupal-module",
"extra": {
"branch-alias": {
"dev-1.x": "1.x-dev"
},
"drupal": {
"version": "8.x-1.x-dev",
"datestamp": "1539810480",
"security-coverage": {
"status": "not-covered",
"message": "Project has not opted into security advisory coverage!"
}
}
},
"notification-url": "https://packages.drupal.org/8/downloads",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "mlncn",
"homepage": "https://www.drupal.org/user/64383"
}
],
"description": "Provides template suggestions for things Drupal doesn't.",
"homepage": "https://www.drupal.org/project/twigsuggest",
"support": {
"source": "http://cgit.drupalcode.org/twigsuggest"
},
"time": "2018-10-17T21:20:34+00:00"
},
{ {
"name": "drupal/video_embed_field", "name": "drupal/video_embed_field",
"version": "2.0.0", "version": "2.0.0",
@ -6592,53 +6639,86 @@
}, },
{ {
"name": "drush/drush", "name": "drush/drush",
"version": "9.4.0", "version": "9.5.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/drush-ops/drush.git", "url": "https://github.com/drush-ops/drush.git",
"reference": "9d46a2a67554ae8b6f6edec234a1272c3b4c6a9e" "reference": "17f0106706391675a281c6d212850853bdbe90f9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/drush-ops/drush/zipball/9d46a2a67554ae8b6f6edec234a1272c3b4c6a9e", "url": "https://api.github.com/repos/drush-ops/drush/zipball/17f0106706391675a281c6d212850853bdbe90f9",
"reference": "9d46a2a67554ae8b6f6edec234a1272c3b4c6a9e", "reference": "17f0106706391675a281c6d212850853bdbe90f9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"chi-teck/drupal-code-generator": "^1.24.0", "chi-teck/drupal-code-generator": "^1.27.0",
"composer/semver": "^1.4", "composer/semver": "^1.4",
"consolidation/annotated-command": "^2.8.1", "consolidation/annotated-command": "^2.9.1",
"consolidation/config": "^1.1.0", "consolidation/config": "^1.1.0",
"consolidation/output-formatters": "^3.1.12", "consolidation/output-formatters": "^3.1.12",
"consolidation/robo": "^1.1.5", "consolidation/robo": "^1.1.5",
"consolidation/site-alias": "^1.1.2", "consolidation/site-alias": "^1.1.5",
"ext-dom": "*", "ext-dom": "*",
"grasmash/yaml-expander": "^1.1.1", "grasmash/yaml-expander": "^1.1.1",
"league/container": "~2", "league/container": "~2",
"php": ">=5.6.0", "php": ">=5.6.0",
"psr/log": "~1.0", "psr/log": "~1.0",
"psy/psysh": "~0.6", "psy/psysh": "~0.6",
"symfony/config": "~2.2|^3", "symfony/config": "^3.4",
"symfony/console": "~2.7|^3", "symfony/console": "^3.4",
"symfony/event-dispatcher": "~2.7|^3", "symfony/event-dispatcher": "^3.4",
"symfony/finder": "~2.7|^3", "symfony/finder": "^3.4",
"symfony/process": "~2.7|^3", "symfony/process": "^3.4",
"symfony/var-dumper": "~2.7|^3|^4", "symfony/var-dumper": "^3.4",
"symfony/yaml": "~2.3|^3", "symfony/yaml": "^3.4",
"webflo/drupal-finder": "^1.1", "webflo/drupal-finder": "^1.1",
"webmozart/path-util": "^2.1.0" "webmozart/path-util": "^2.1.0"
}, },
"require-dev": { "require-dev": {
"composer/installers": "^1.2",
"cweagans/composer-patches": "~1.0",
"drupal/alinks": "1.0.0",
"drupal/devel": "^1.0@RC",
"drupal/empty_theme": "1.0",
"g1a/composer-test-scenarios": "^2.2.0", "g1a/composer-test-scenarios": "^2.2.0",
"lox/xhprof": "dev-master", "lox/xhprof": "dev-master",
"phpunit/phpunit": "^4.8.36|^5.5.4", "phpunit/phpunit": "^4.8.36 || ^6.1",
"squizlabs/php_codesniffer": "^2.7" "squizlabs/php_codesniffer": "^2.7",
"vlucas/phpdotenv": "^2.4",
"webflo/drupal-core-strict": "8.6.x-dev"
}, },
"bin": [ "bin": [
"drush" "drush"
], ],
"type": "library", "type": "library",
"extra": { "extra": {
"installer-paths": {
"sut/core": [
"type:drupal-core"
],
"sut/libraries/{$name}": [
"type:drupal-library"
],
"sut/modules/unish/{$name}": [
"drupal/devel"
],
"sut/themes/unish/{$name}": [
"drupal/empty_theme"
],
"sut/modules/contrib/{$name}": [
"type:drupal-module"
],
"sut/profiles/contrib/{$name}": [
"type:drupal-profile"
],
"sut/themes/contrib/{$name}": [
"type:drupal-theme"
],
"sut/drush/contrib/{$name}": [
"type:drupal-drush"
]
},
"branch-alias": { "branch-alias": {
"dev-master": "9.x-dev" "dev-master": "9.x-dev"
} }
@ -6690,7 +6770,7 @@
], ],
"description": "Drush is a command line shell and scripting interface for Drupal, a veritable Swiss Army knife designed to make life easier for those of us who spend some of our working hours hacking away at the command prompt.", "description": "Drush is a command line shell and scripting interface for Drupal, a veritable Swiss Army knife designed to make life easier for those of us who spend some of our working hours hacking away at the command prompt.",
"homepage": "http://www.drush.org", "homepage": "http://www.drush.org",
"time": "2018-09-04T17:24:36+00:00" "time": "2018-10-17T18:37:53+00:00"
}, },
{ {
"name": "drutopia/drutopia", "name": "drutopia/drutopia",
@ -7311,33 +7391,34 @@
}, },
{ {
"name": "jakub-onderka/php-console-highlighter", "name": "jakub-onderka/php-console-highlighter",
"version": "v0.3.2", "version": "v0.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git", "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
"reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5" "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5", "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547",
"reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5", "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"jakub-onderka/php-console-color": "~0.1", "ext-tokenizer": "*",
"php": ">=5.3.0" "jakub-onderka/php-console-color": "~0.2",
"php": ">=5.4.0"
}, },
"require-dev": { "require-dev": {
"jakub-onderka/php-code-style": "~1.0", "jakub-onderka/php-code-style": "~1.0",
"jakub-onderka/php-parallel-lint": "~0.5", "jakub-onderka/php-parallel-lint": "~1.0",
"jakub-onderka/php-var-dump-check": "~0.1", "jakub-onderka/php-var-dump-check": "~0.1",
"phpunit/phpunit": "~4.0", "phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~1.5" "squizlabs/php_codesniffer": "~1.5"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-0": { "psr-4": {
"JakubOnderka\\PhpConsoleHighlighter": "src/" "JakubOnderka\\PhpConsoleHighlighter\\": "src/"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -7351,7 +7432,8 @@
"homepage": "http://www.acci.cz/" "homepage": "http://www.acci.cz/"
} }
], ],
"time": "2015-04-20T18:58:01+00:00" "description": "Highlight PHP code in terminal",
"time": "2018-09-29T18:48:56+00:00"
}, },
{ {
"name": "league/container", "name": "league/container",
@ -7731,23 +7813,23 @@
}, },
{ {
"name": "psy/psysh", "name": "psy/psysh",
"version": "v0.9.8", "version": "v0.9.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bobthecow/psysh.git", "url": "https://github.com/bobthecow/psysh.git",
"reference": "ed3c32c4304e1a678a6e0f9dc11dd2d927d89555" "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/ed3c32c4304e1a678a6e0f9dc11dd2d927d89555", "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9aaf29575bb8293206bb0420c1e1c87ff2ffa94e",
"reference": "ed3c32c4304e1a678a6e0f9dc11dd2d927d89555", "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"dnoegel/php-xdg-base-dir": "0.1", "dnoegel/php-xdg-base-dir": "0.1",
"ext-json": "*", "ext-json": "*",
"ext-tokenizer": "*", "ext-tokenizer": "*",
"jakub-onderka/php-console-highlighter": "0.3.*", "jakub-onderka/php-console-highlighter": "0.3.*|0.4.*",
"nikic/php-parser": "~1.3|~2.0|~3.0|~4.0", "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
"php": ">=5.4.0", "php": ">=5.4.0",
"symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0", "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
@ -7801,7 +7883,7 @@
"interactive", "interactive",
"shell" "shell"
], ],
"time": "2018-09-05T11:40:09+00:00" "time": "2018-10-13T15:16:03+00:00"
}, },
{ {
"name": "stack/builder", "name": "stack/builder",
@ -8934,61 +9016,6 @@
], ],
"time": "2018-08-06T14:22:27+00:00" "time": "2018-08-06T14:22:27+00:00"
}, },
{
"name": "symfony/polyfill-php72",
"version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "95c50420b0baed23852452a7f0c7b527303ed5ae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/95c50420b0baed23852452a7f0c7b527303ed5ae",
"reference": "95c50420b0baed23852452a7f0c7b527303ed5ae",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Php72\\": ""
},
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"time": "2018-08-06T14:22:27+00:00"
},
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v3.4.17", "version": "v3.4.17",
@ -9410,44 +9437,38 @@
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v4.1.6", "version": "v3.4.17",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "60319b45653580b0cdacca499344577d87732f16" "reference": "ff8ac19e97e5c7c3979236b584719a1190f84181"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/60319b45653580b0cdacca499344577d87732f16", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ff8ac19e97e5c7c3979236b584719a1190f84181",
"reference": "60319b45653580b0cdacca499344577d87732f16", "reference": "ff8ac19e97e5c7c3979236b584719a1190f84181",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1.3", "php": "^5.5.9|>=7.0.8",
"symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-mbstring": "~1.0"
"symfony/polyfill-php72": "~1.5"
}, },
"conflict": { "conflict": {
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
"symfony/console": "<3.4"
}, },
"require-dev": { "require-dev": {
"ext-iconv": "*", "ext-iconv": "*",
"symfony/process": "~3.4|~4.0",
"twig/twig": "~1.34|~2.4" "twig/twig": "~1.34|~2.4"
}, },
"suggest": { "suggest": {
"ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
"ext-intl": "To show region name in time zone dump", "ext-intl": "To show region name in time zone dump",
"symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script" "ext-symfony_debug": ""
}, },
"bin": [
"Resources/bin/var-dump-server"
],
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.1-dev" "dev-master": "3.4-dev"
} }
}, },
"autoload": { "autoload": {
@ -9481,7 +9502,7 @@
"debug", "debug",
"dump" "dump"
], ],
"time": "2018-10-02T16:36:10+00:00" "time": "2018-10-02T16:33:53+00:00"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
@ -9967,7 +9988,8 @@
"drupal/drutopia_resource": 20, "drupal/drutopia_resource": 20,
"drupal/webform": 5, "drupal/webform": 5,
"drupal/block_theme_sync": 15, "drupal/block_theme_sync": 15,
"drupal/coffee": 10 "drupal/coffee": 10,
"drupal/twigsuggest": 20
}, },
"prefer-stable": true, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,

View file

@ -0,0 +1,11 @@
uuid: ca3e5cbb-e613-40bb-bed9-a3663789c2ff
langcode: en
status: true
dependencies:
module:
- twigsuggest
id: config_sync.module.twigsuggest
snapshotSet: config_sync
extensionType: module
extensionName: twigsuggest
items: { }

View file

@ -99,6 +99,7 @@ module:
token: 0 token: 0
toolbar: 0 toolbar: 0
tour: 0 tour: 0
twigsuggest: 0
update: 0 update: 0
user: 0 user: 0
video_embed_field: 0 video_embed_field: 0

@ -1 +1 @@
Subproject commit 119dce82eff8ae436e7f0586ca3c0cf9b970320c Subproject commit 0fa20b525eb5b348e74a9a731bd686c1329c69cb