Skip to content

Commit

Permalink
Merge branch 'release/0.6.5'
Browse files Browse the repository at this point in the history
Conflicts:
	bower.json
	src/main/javascript/monet-pimp.js
	src/main/javascript/monet.js
  • Loading branch information
Chris Myers committed Feb 23, 2014
2 parents 43db892 + d06ee05 commit db82cc5
Show file tree
Hide file tree
Showing 9 changed files with 967 additions and 236 deletions.
348 changes: 305 additions & 43 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monet",
"version": "0.6.4",
"version": "0.6.5",
"main": ["src/main/javascript/monet.js","src/main/javascript/monet-pimp.js"],
"ignore": [
"**/.*",
Expand Down
10 changes: 9 additions & 1 deletion src/main/javascript/monet-pimp.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// monet-pimp.js 0.6.4
// monet-pimp.js 0.6.5

// This file needs to be included after monet.js

Expand Down Expand Up @@ -26,6 +26,14 @@
return Validation.fail(this)
}

Object.prototype.right = function() {
return Either.Right(this)
}

Object.prototype.left = function() {
return Either.Left(this)
}

Array.prototype.list = function () {
return List.fromArray(this)
}
Expand Down
Loading

0 comments on commit db82cc5

Please sign in to comment.