Skip to content

Commit

Permalink
Merge branch 'master' into typed-2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mattboldt authored Jun 28, 2017
2 parents 7fc2876 + 417835d commit ccbf412
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/mattboldt/typed.js/master/LICENSE.txt)

<img src="/logo-cropped.png" width="450px" title="Typed.js" />
------

### Notice: development on master is currently halted for the upcoming release of v2.0 on [#264](https://github.com/mattboldt/typed.js/pull/264)


[View the live demo](http://www.mattboldt.com/demos/typed-js/) | [Go to my site, mattboldt.com](http://www.mattboldt.com)

Expand Down

0 comments on commit ccbf412

Please sign in to comment.