mirror of
				https://github.com/KevinMidboe/linguist.git
				synced 2025-10-29 17:50:22 +00:00 
			
		
		
		
	Merge branch 'master' into drop-samples.json
Conflicts: .travis.yml
This commit is contained in:
		@@ -2,7 +2,6 @@ before_install:
 | 
				
			|||||||
  - git fetch origin master:master
 | 
					  - git fetch origin master:master
 | 
				
			||||||
  - git fetch origin v2.0.0:v2.0.0
 | 
					  - git fetch origin v2.0.0:v2.0.0
 | 
				
			||||||
  - sudo apt-get install libicu-dev -y
 | 
					  - sudo apt-get install libicu-dev -y
 | 
				
			||||||
  - gem update --system 2.1.11
 | 
					 | 
				
			||||||
rvm:
 | 
					rvm:
 | 
				
			||||||
  - 1.9.3
 | 
					  - 1.9.3
 | 
				
			||||||
  - 2.0.0
 | 
					  - 2.0.0
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user