Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolasRannou committed Dec 14, 2016
2 parents 288d5ab + d8e8747 commit 98dbc56
Show file tree
Hide file tree
Showing 33 changed files with 1,866 additions and 502 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
<a href="https://codeclimate.com/github/FNNDSC/ami">
<img src="https://codeclimate.com/github/FNNDSC/ami/badges/gpa.svg"
alt="Code Climate">
</a>
<a href="https://cdnjs.com/libraries/ami.js">
<img src="https://img.shields.io/cdnjs/v/ami.js.svg"
alt="CDNJS Version">
</a>
<a href="https://www.npmjs.com/package/ami.js">
<img src="https://img.shields.io/npm/v/ami.js.svg"
Expand Down Expand Up @@ -243,7 +247,7 @@ Add AMI in your index.html **after** THREEJS.
```
# index.html
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r81/three.js"></script>
<script src="https://rawgit.com/FNNDSC/ami/master/dist/ami.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ami.js/0.0.11/ami.min.js"></script>
<script src="app.js"></script>
#app.js
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "ami.js",
"version": "v0.0.11",
"version": "v0.0.12",
"dependencies": {}
}
Loading

0 comments on commit 98dbc56

Please sign in to comment.