Skip to content

Commit

Permalink
Merge branch 'master' of github.com:bpampuch/pdfmake
Browse files Browse the repository at this point in the history
Conflicts:
	bower.json
	build/pdfmake.min.js
	build/pdfmake.min.map
	package.json
  • Loading branch information
Bartek Pampuch committed Mar 21, 2014
2 parents 2d85d20 + c61b5d1 commit e054e2d
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": "pdfmake",
"version": "0.0.15",
"version": "0.1.0",
"homepage": "https://bpampuch.github.io/pdfmake",
"authors": [
"Bartek Pampuch <[email protected]>"
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": "pdfmake",
"version": "0.0.15",
"version": "0.1.0",
"description": "Client/server side PDF printing in pure JavaScript",
"main": "src/printer.js",
"directories": {
Expand Down

0 comments on commit e054e2d

Please sign in to comment.