summaryrefslogtreecommitdiff
path: root/composer.json
diff options
context:
space:
mode:
authorCiro Mattia Gonano <ciromattia@gmail.com>2013-03-01 11:24:10 +0100
committerCiro Mattia Gonano <ciromattia@gmail.com>2013-03-01 11:24:10 +0100
commit4479579e59ef03f25e98ca65b19371910bec52ec (patch)
treefc8f850b6649d25ba57eebf83c34fb099e351f43 /composer.json
parent6e7998ec583cf701ad45ab29475a8d484d7df073 (diff)
Composer update
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index 8a301938..dddbb062 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "master",
}
}
}