Skip to content

Commit

Permalink
Merge pull request #51 from support-project/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
koda-masaru committed Jun 27, 2015
2 parents 78bf591 + d6a0b26 commit 9ea4ace
Show file tree
Hide file tree
Showing 95 changed files with 10,229 additions and 590 deletions.
8 changes: 5 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"name": "knowledge",
"dependencies": {
"jquery": "2.1.1",
"bootstrap": "3.3.1",
"font-awesome": "4.2.0",
"jquery": "1.11.3",
"bootstrap": "3.3.4",
"font-awesome": "4.3.0",
"html5shiv": "3.7.2",
"respond": "1.4.2",
"notifyjs": "0.3.2",
"marked": "0.3.2",
"highlightjs": "8.3.0",
Expand Down
Loading

0 comments on commit 9ea4ace

Please sign in to comment.