mirror of
				https://github.com/sharkdp/bat.git
				synced 2025-10-31 07:04:04 +00:00 
			
		
		
		
	Merge branch 'master' into add-cfml
This commit is contained in:
		| @@ -52,6 +52,7 @@ | |||||||
| - Added auto detect syntax for `.jsonc` #2795 (@mxaddict) | - Added auto detect syntax for `.jsonc` #2795 (@mxaddict) | ||||||
| - Added auto detect syntax for `.aws/{config,credentials}` #2795 (@mxaddict) | - Added auto detect syntax for `.aws/{config,credentials}` #2795 (@mxaddict) | ||||||
| - Add syntax mapping for Wireguard config #2874 (@cyqsimon) | - Add syntax mapping for Wireguard config #2874 (@cyqsimon) | ||||||
|  | - Associate `.textproto` files with `ProtoBuf` syntax, see #3038 (@vorburger). | ||||||
| - Add support for [CFML](https://www.adobe.com/products/coldfusion-family.html), see #3031 (@brenton-at-pieces) | - Add support for [CFML](https://www.adobe.com/products/coldfusion-family.html), see #3031 (@brenton-at-pieces) | ||||||
|  |  | ||||||
| ## Themes | ## Themes | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								assets/syntaxes/02_Extra/Protobuf
									
									
									
									
										vendored
									
									
								
							
							
								
								
								
								
								
							
						
						
									
										2
									
								
								assets/syntaxes/02_Extra/Protobuf
									
									
									
									
										vendored
									
									
								
							 Submodule assets/syntaxes/02_Extra/Protobuf updated: 726e21d74d...1365331580
									
								
							
		Reference in New Issue
	
	Block a user