Skip to content

Commit

Permalink
Merge branch 'release/v4.0.0'
Browse files Browse the repository at this point in the history 
Conflicts:
	bower.json
	package.json
  • Loading branch information
@AleksueiR
AleksueiR committed Nov 21, 2014
2 parents c828e3c + 2846fd6 commit 29ac948
Show file tree
Hide file tree
Showing 4 changed files with 266 additions and 94 deletions.
Loading

0 comments on commit 29ac948

Please sign in to comment.