diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-19 17:13:26 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-19 17:13:26 -0700 |
| commit | f746418fda3f29f4635a26c744990911e8fb6309 (patch) | |
| tree | ec4f7bba45ca205c2edbd7ca730c4179ac20b083 /composer.lock | |
| parent | be10bf2cebd5d3ee449901cbf6814bf9a284bd10 (diff) | |
| parent | 1bdab6e633fd023432ed86ad898da1fe4ddc470f (diff) | |
| download | volse-hubzilla-f746418fda3f29f4635a26c744990911e8fb6309.tar.gz volse-hubzilla-f746418fda3f29f4635a26c744990911e8fb6309.tar.bz2 volse-hubzilla-f746418fda3f29f4635a26c744990911e8fb6309.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'composer.lock')
| -rw-r--r-- | composer.lock | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/composer.lock b/composer.lock index c9c4eb230..ecb9be78e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "46492fdee6fa6ef4ef6612a0f0006c2b", - "content-hash": "b0d4055ddb064eafb50cf58cf939e1e5", + "content-hash": "9842014a99ac4e654bc7bfd6061d6f60", "packages": [ { "name": "bshaffer/oauth2-server-php", @@ -61,7 +60,7 @@ "oauth", "oauth2" ], - "time": "2017-01-06 23:20:00" + "time": "2017-01-06T23:20:00+00:00" }, { "name": "michelf/php-markdown", |