aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/psr/log/composer.json
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-11-08 13:10:24 -0800
committerzotlabs <mike@macgirvin.com>2019-11-08 13:10:24 -0800
commit00dd52317adb0f7db339649e076df331975a8398 (patch)
treed9559c19aafb1fb0ead583aeab662b1f9a94d2a5 /vendor/psr/log/composer.json
parent17522b31e9d7f092ecf5565ec28be270af7fad7b (diff)
parent163b1ee9f82985755f8e74fd144780ae08ce4030 (diff)
downloadvolse-hubzilla-00dd52317adb0f7db339649e076df331975a8398.tar.gz
volse-hubzilla-00dd52317adb0f7db339649e076df331975a8398.tar.bz2
volse-hubzilla-00dd52317adb0f7db339649e076df331975a8398.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'vendor/psr/log/composer.json')
-rw-r--r--vendor/psr/log/composer.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/psr/log/composer.json b/vendor/psr/log/composer.json
index 87934d707..3f6d4eea4 100644
--- a/vendor/psr/log/composer.json
+++ b/vendor/psr/log/composer.json
@@ -20,7 +20,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.1.x-dev"
}
}
}