Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
tsachis committed Jul 24, 2016
2 parents 960cd7f + 6af051c commit a4de8e6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "leonardo",
"version": "1.0.0",
"version": "3.0.0",
"homepage": "https://github.com/outbrain/Leonardo",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "leonardojs",
"version": "2.0.0",
"version": "3.0.0",
"description": "Leonardo ========",
"main": "dist/leonardo.js",
"scripts": {
Expand Down

0 comments on commit a4de8e6

Please sign in to comment.