Skip to content

Commit

Permalink
Merge branch 'master' into master-dist
Browse files Browse the repository at this point in the history
  • Loading branch information
patternfly-build committed Dec 15, 2016
2 parents 0ae59fb + c3debcf commit c5102ca
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
Expand Up @@ -2,7 +2,7 @@
"name": "patternfly-timeline",
"description": "A time based/event series interactive visualization using d3.js. Use drag and zoom to navigate in time.",
"main": "dist/timeline.js",
"version": "1.0.0",
"version": "1.0.4",
"authors": [
"Red Hat"
],
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": "patternfly-timeline",
"version": "1.0.3",
"version": "1.0.4",
"description": "A time based / event series interactive visualization using d3.js. Use drag and zoom to navigate in time.",
"main": "dist/timeline.js",
"repository": {
Expand Down

0 comments on commit c5102ca

Please sign in to comment.