Skip to content

Commit

Permalink
Merge branch 'feature/update-acf'
Browse files Browse the repository at this point in the history
Fix #117
  • Loading branch information
briggySmalls committed Apr 26, 2019
2 parents b6a29c9 + 6cd3d59 commit 8da621c
Show file tree
Hide file tree
Showing 2 changed files with 97 additions and 17 deletions.
20 changes: 4 additions & 16 deletions site/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,8 @@
"url": "https://github.com/briggySmalls/soil"
},
{
"type": "package",
"package": {
"name": "advanced-custom-fields/advanced-custom-fields-pro",
"version": "5.8.0-beta2",
"type": "wordpress-muplugin",
"dist": {
"type": "zip",
"url": "https://connect.advancedcustomfields.com/index.php?p=pro&a=download"
},
"require": {
"philippbaschke/acf-pro-installer": "^1.0",
"composer/installers": "^1.0"
}
}
"type": "composer",
"url": "https://pivvenit.github.io/acf-composer-bridge/composer/v2/"
}
],
"require": {
Expand All @@ -71,8 +59,8 @@
"automattic/jetpack": "^6.5",
"wpackagist-plugin/gutenberg": "4.5.1",
"wpackagist-plugin/ticket-tailor": "1.7",
"wpackagist-plugin/autodescription": "^3.2"

"wpackagist-plugin/autodescription": "^3.2",
"advanced-custom-fields/advanced-custom-fields-pro": "5.8.0-RC2"
},
"require-dev": {
"squizlabs/php_codesniffer": "^3.0.2",
Expand Down
94 changes: 93 additions & 1 deletion site/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8da621c

Please sign in to comment.