Merge branch 'master' of https://github.com/nnluukhtn/picturefill_rails · nnluukhtn/picturefill_rails@21eb8e6 · GitHub

Commit

Merge branch 'master' of https://github.com/nnluukhtn/picturefill_rails

Browse files

# Conflicts:
#	.gitignore
#	README.md

Loading branch information

nnluukhtn committed Mar 16, 2016

2 parents fd85238 + 8c2b1d1 commit 21eb8e6