Commit cacc1833 authored by Qiang Xue's avatar Qiang Xue

Merge branch 'master' into new-asset

parents e93174f3 0bdbf0d9
......@@ -12,8 +12,7 @@
],
"license": "BSD-3-Clause",
"ignore": [
"**/.*",
"**/*"
"/*"
],
"dependencies": {
"bootstrap": ">=3.0.0"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment