Merge commit 'refs/pull/1042/head' of github.com:github/linguist into 1042

Conflicts:
	lib/linguist/vendor.yml
This commit is contained in:
Arfon Smith
2014-06-06 12:32:30 -05:00

View File

@@ -201,6 +201,6 @@
- Mercury/
# R packages
- vignettes/
- inst/extdata/
- ^vignettes/
- ^inst/extdata/