Skip to content

Commit 245349c

Browse files
committed
Merge branch 'development'
2 parents 1f32e76 + dbc0de2 commit 245349c

10 files changed

+76
-387
lines changed

.circleci/config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ jobs:
104104
name: Add extra OS and PHP extensions/config
105105
command: |
106106
sudo cp /home/circleci/project/.circleci/docker-php-circleci.ini /usr/local/etc/php/conf.d/
107+
sudo apt-get --allow-releaseinfo-change update
107108
sudo apt-get install -y libpng-dev mariadb-client rsync
108109
sudo docker-php-ext-install gd pdo_mysql
109110
- run:

composer.json

+6-7
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
"require": {
3333
"composer/installers": "^1.2",
3434
"cweagans/composer-patches": "^1.6.5",
35-
"dof-dss/nicsdru_nidirect_theme": "^0.9.3",
36-
"dof-dss/nicsdru_origins_modules": "^0.6",
37-
"dof-dss/nicsdru_origins_theme": "^0.3",
38-
"dof-dss/nidirect-d8-test-install-profile": "^0.2",
39-
"dof-dss/nidirect-migrations": "^0.9.3",
40-
"dof-dss/nidirect-site-modules": "^0.9.3",
35+
"dof-dss/nicsdru_nidirect_theme": "^0.10.1",
36+
"dof-dss/nicsdru_origins_modules": "^0.7.0",
37+
"dof-dss/nicsdru_origins_theme": "0.3.1",
38+
"dof-dss/nidirect-d8-test-install-profile": "^0.2.2",
39+
"dof-dss/nidirect-migrations": "0.10.1",
40+
"dof-dss/nidirect-site-modules": "^0.10.1",
4141
"drupal/address": "^1.7",
4242
"drupal/admin_toolbar": "^2.0",
4343
"drupal/adminimal_theme": "^1.5",
@@ -95,7 +95,6 @@
9595
"drupal/smart_trim": "^1.2",
9696
"drupal/structure_sync": "^1.16",
9797
"drupal/taxonomy_access_fix": "^2.6",
98-
"drupal/taxonomy_manager": "^1.0@alpha",
9998
"drupal/telephone_plus": "1.x-dev",
10099
"drupal/token": "^1.5",
101100
"drupal/token_filter": "^1.1",

0 commit comments

Comments
 (0)