Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	dist/ramda-validator.js
#	src/helpers/and.js
#	src/helpers/not.js
#	src/helpers/or.js
#	src/ramda-validator.js
  • Loading branch information
romkor committed Dec 16, 2015
2 parents 42220a2 + d956199 commit aff74a2
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit aff74a2

Please sign in to comment.