2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

Merge branch 'master' into v4

This commit is contained in:
Mark Otto
2015-06-18 23:56:43 -07:00
80 changed files with 2784 additions and 1569 deletions
+4 -5
View File
@@ -1,12 +1,11 @@
{
"paths": {
"docsJs": [
"assets/js/vendor/holder.js",
"../assets/js/vendor/holder.min.js",
"assets/js/vendor/jekyll-search.js",
"assets/js/vendor/ZeroClipboard.min.js",
"assets/js/vendor/anchor.js",
"assets/js/src/application.js"
"../assets/js/vendor/ZeroClipboard.min.js",
"../assets/js/vendor/anchor.js",
"../assets/js/src/application.js"
]
},
"config": {