Skip to content

Commit

Permalink
Merge branch 'hotfix/1.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
GROwen committed May 14, 2019
2 parents a2f18df + acde067 commit ce2956a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ aliases:
at: /workspace
- checkout
# Init environment for development.
- run: if [ -f "./dev-init.sh" ] && [ ! "$DEV_TOOLS" ]; then ./dev-init.sh; fi
- run: if [ -f "./dev-tools.sh" ] && [ ! "$DEV_TOOLS" ]; then ./dev-tools.sh; fi
- setup_remote_docker:
docker_layer_caching: true
- run: .circleci/build.sh
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
"type": "drupal-profile",
"license": "GPL-2.0-or-later",
"require": {
"dpc-sdp/tide_api": "1.2.1",
"dpc-sdp/tide_core": "1.2.0",
"dpc-sdp/tide_event": "1.2.1",
"dpc-sdp/tide_landing_page": "1.1.1",
"dpc-sdp/tide_api": "1.2.3",
"dpc-sdp/tide_core": "1.2.1",
"dpc-sdp/tide_event": "1.2.2",
"dpc-sdp/tide_landing_page": "1.1.2",
"dpc-sdp/tide_media": "1.2.1",
"dpc-sdp/tide_monsido": "1.1.1",
"dpc-sdp/tide_news": "1.1.1",
"dpc-sdp/tide_page": "1.2.1",
"dpc-sdp/tide_search": "1.1.1",
"dpc-sdp/tide_site": "1.1.1",
"dpc-sdp/tide_news": "1.1.2",
"dpc-sdp/tide_page": "1.2.2",
"dpc-sdp/tide_search": "1.1.2",
"dpc-sdp/tide_site": "1.1.2",
"dpc-sdp/tide_test": "^1.0",
"dpc-sdp/tide_webform": "1.1.1"
"dpc-sdp/tide_webform": "1.1.2"
},
"repositories": {
"drupal": {
Expand Down

0 comments on commit ce2956a

Please sign in to comment.