Merge branch '6.0.x'
This commit is contained in:
		
						commit
						72152ff1f3
					
				|  | @ -807,14 +807,12 @@ public final class ContentDisposition { | |||
| 
 | ||||
| 		@Override | ||||
| 		public Builder filename(String filename) { | ||||
| 			Assert.hasText(filename, "No filename"); | ||||
| 			this.filename = filename; | ||||
| 			return this; | ||||
| 		} | ||||
| 
 | ||||
| 		@Override | ||||
| 		public Builder filename(String filename, Charset charset) { | ||||
| 			Assert.hasText(filename, "No filename"); | ||||
| 			this.filename = filename; | ||||
| 			this.charset = charset; | ||||
| 			return this; | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue