Merge branch 'cache-combinedstyles' of github.com:vanderlee/emogrifie… · MyIntervals/emogrifier@bbe41c2 · GitHub

Commit

Merge branch 'cache-combinedstyles' of github.com:vanderlee/emogrifie…

Browse files

…r into cache-combinedstyles

Conflicts:
	Classes/Emogrifier.php

Loading branch information

vanderlee committed Jul 11, 2015

1 parent 1c65c16 commit bbe41c2