Commit Graph

2 Commits

Author SHA1 Message Date
Alex Bilbie
4a71c376b8 Merge branch 'refs/heads/master' into develop
Conflicts:
	.travis.yml
	README.md
2013-09-26 11:18:10 +01:00
Alex Bilbie
1440a5e46c Added a .gitattributes file
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
2012-09-19 19:48:32 +01:00