Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/jamboid/Fuzz
Browse files Browse the repository at this point in the history 
Conflicts:
	README.md
  • Loading branch information
@jamboid
jamboid committed Oct 6, 2014
2 parents 451b3a9 + 141ca6a commit fff771f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,4 @@ To view the page you should open the project in CodeKit 2 and use the in-built p

+ http://twitter.com/jamboid
+ http://github.com/jamboid
+ http://jamieboyd.net
+ http://jamieboyd.net

0 comments on commit fff771f

Please sign in to comment.