Merge branch 'master' of https://github.com/bentonam/fakeit into dev · bentonam/fakeit@607c03b · GitHub

Commit

Merge branch 'master' of https://github.com/bentonam/fakeit into dev

Browse files

* 'master' of https://github.com/bentonam/fakeit:
  1.0.0
  1.0.0 (#125)
  Release 0.4.0
  Release 0.3.3

# Conflicts:
#	Makefile
#	README.md
#	package.json

Loading branch information

tjbenton committed Feb 16, 2017

2 parents 7fa5454 + cad3cea commit 607c03b