From 4caef2ddb1bcb0353958f7de3bfbdabcc1978c5f Mon Sep 17 00:00:00 2001 From: Michael Stenta Date: Wed, 11 Apr 2018 12:25:31 -0400 Subject: [PATCH] Revert "farmOS 7.x-1.0-beta17." This reverts commit 76f09121b7de39d29682a8490714f590a2e75bbd. --- build-farm.make | 8 ++++---- docker-compose.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-farm.make b/build-farm.make index a9ac5df97..50d188e17 100644 --- a/build-farm.make +++ b/build-farm.make @@ -12,8 +12,8 @@ includes[] = drupal-org-core.make ; ----------------------------------------------------------------------------- projects[farm][type] = profile -projects[farm][version] = 1.0-beta17 -;projects[farm][download][type] = git -;projects[farm][download][url] = http://git.drupal.org/project/farm.git -;projects[farm][download][branch] = 7.x-1.x +;projects[farm][version] = 1.0-beta17 +projects[farm][download][type] = git +projects[farm][download][url] = http://git.drupal.org/project/farm.git +projects[farm][download][branch] = 7.x-1.x diff --git a/docker-compose.yml b/docker-compose.yml index 5f0c537cf..faaebe785 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,8 +15,8 @@ services: www: depends_on: - db - image: farmos/farmos:7.x-1.0-beta17 -# image: farmos/farmos:7.x-1.x +# image: farmos/farmos:7.x-1.0-beta17 + image: farmos/farmos:7.x-1.x volumes: - './.data/www:/var/www/html' links: