aboutsummaryrefslogtreecommitdiffstats
path: root/library/font_awesome/composer.json
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-01-10 11:22:32 -0800
committerzotlabs <mike@macgirvin.com>2017-01-10 11:22:32 -0800
commitf2f6a0534257394e52e9d8e41dce8ac55db332d1 (patch)
treeee48c0213aed8b3ab07f9fca163b05d194c09de4 /library/font_awesome/composer.json
parent52441dd754f0de0177f23ea4cb8d28aad834d5d9 (diff)
parent38dd1c342a5d86989a2773f6499c7fbd005e241d (diff)
downloadvolse-hubzilla-f2f6a0534257394e52e9d8e41dce8ac55db332d1.tar.gz
volse-hubzilla-f2f6a0534257394e52e9d8e41dce8ac55db332d1.tar.bz2
volse-hubzilla-f2f6a0534257394e52e9d8e41dce8ac55db332d1.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'library/font_awesome/composer.json')
-rw-r--r--library/font_awesome/composer.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/font_awesome/composer.json b/library/font_awesome/composer.json
index f1b9f3707..c9f41120e 100644
--- a/library/font_awesome/composer.json
+++ b/library/font_awesome/composer.json
@@ -13,7 +13,7 @@
],
"extra": {
"branch-alias": {
- "dev-master": "4.0.x-dev"
+ "dev-master": "4.6.x-dev"
}
},
"license": [