From e6c46ccfaf36766e9b76c985834ddf7d00f638e6 Mon Sep 17 00:00:00 2001
From: Charles Severance <csev@umich.edu>
Date: Tue, 13 Aug 2019 10:34:13 -0400
Subject: [PATCH] Round trip the D2l bug fixes.

---
 .gitignore                     |  1 +
 composer.json                  |  2 +-
 composer.lock                  | 10 +++++-----
 vendor/composer/installed.json |  6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index a1d8cba904..e681a58ca5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ exercises
 samples
 cc.zip
 mod
+tsugi-php-samples
diff --git a/composer.json b/composer.json
index 6452bca9ed..840fa25a80 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "tsugi/lib": "dev-master#b4abf7ab645b3e59b37a1ee8c9e8f206175158ad",
+        "tsugi/lib": "dev-master#fdfa26bf0fa5142d84169e4a777e4394652310a9",
         "twig/twig": "v1.33.2",
         "silex/silex": "v2.0.4",
         "pimple/pimple": "v3.0.2",
diff --git a/composer.lock b/composer.lock
index 86cde88de0..ef56a90cc8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "c5f55cc1e6e0b55c531903de116430d7",
-    "content-hash": "e657c3d0b3b520a1c81565dca12ab74f",
+    "hash": "bf7de502e2219265d1437ffb1860bf5c",
+    "content-hash": "5e71c48386653715f7bd7c830b964f07",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
@@ -2211,12 +2211,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/tsugiproject/tsugi-php.git",
-                "reference": "b4abf7ab645b3e59b37a1ee8c9e8f206175158ad"
+                "reference": "fdfa26bf0fa5142d84169e4a777e4394652310a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/b4abf7ab645b3e59b37a1ee8c9e8f206175158ad",
-                "reference": "b4abf7ab645b3e59b37a1ee8c9e8f206175158ad",
+                "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/fdfa26bf0fa5142d84169e4a777e4394652310a9",
+                "reference": "fdfa26bf0fa5142d84169e4a777e4394652310a9",
                 "shasum": ""
             },
             "require": {
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 0029249b5e..2f7c7414d5 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2346,12 +2346,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/tsugiproject/tsugi-php.git",
-            "reference": "b4abf7ab645b3e59b37a1ee8c9e8f206175158ad"
+            "reference": "fdfa26bf0fa5142d84169e4a777e4394652310a9"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/b4abf7ab645b3e59b37a1ee8c9e8f206175158ad",
-            "reference": "b4abf7ab645b3e59b37a1ee8c9e8f206175158ad",
+            "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/fdfa26bf0fa5142d84169e4a777e4394652310a9",
+            "reference": "fdfa26bf0fa5142d84169e4a777e4394652310a9",
             "shasum": ""
         },
         "require": {