aboutsummaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-09-10 22:11:26 -0700
committerzotlabs <mike@macgirvin.com>2018-09-10 22:11:26 -0700
commitadc164b825c3b9e322921f2da9d1baf178b04cd3 (patch)
treefa5e805e53e7661ad936873e1a66017ad9dcd6a9 /composer.json
parentbe3b6304742a6c39d73674b1f7422c029e7cd804 (diff)
parentc6abe87ec2e08fc38ff9c505ac2000d52d45c228 (diff)
downloadvolse-hubzilla-adc164b825c3b9e322921f2da9d1baf178b04cd3.tar.gz
volse-hubzilla-adc164b825c3b9e322921f2da9d1baf178b04cd3.tar.bz2
volse-hubzilla-adc164b825c3b9e322921f2da9d1baf178b04cd3.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index 33bc56fa7..b2aec5332 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,8 @@
"commerceguys/intl": "~0.7",
"lukasreschke/id3parser": "^0.0.1",
"smarty/smarty": "~3.1",
- "ramsey/uuid": "^3.8"
+ "ramsey/uuid": "^3.8",
+ "twbs/bootstrap": "4.1.3"
},
"require-dev" : {
"phpunit/phpunit" : "@stable",