Merge remote-tracking branch 'upstream/master' into mercury-noconflict

This commit is contained in:
Sebastian Godelet
2014-04-18 12:28:18 +02:00
2 changed files with 2 additions and 1 deletions

View File

@@ -1,6 +1,6 @@
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = 'github-linguist' s.name = 'github-linguist'
s.version = '2.10.11' s.version = '2.10.12'
s.summary = "GitHub Language detection" s.summary = "GitHub Language detection"
s.description = 'We use this library at GitHub to detect blob languages, highlight code, ignore binary files, suppress generated files in diffs, and generate language breakdown graphs.' s.description = 'We use this library at GitHub to detect blob languages, highlight code, ignore binary files, suppress generated files in diffs, and generate language breakdown graphs.'

View File

@@ -1873,6 +1873,7 @@ XML:
- .kml - .kml
- .launch - .launch
- .mxml - .mxml
- .osm
- .plist - .plist
- .pluginspec - .pluginspec
- .ps1xml - .ps1xml