mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-04 05:28:59 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into next60
This commit is contained in:
		
						commit
						76196ed42c
					
				
							
								
								
									
										
											BIN
										
									
								
								.idea/shelf/Uncommitted_changes_before_Checkout_at_13_05_23,_16_28_[Changes]/Montserrat-Light.ttf
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								.idea/shelf/Uncommitted_changes_before_Checkout_at_13_05_23,_16_28_[Changes]/Montserrat-Light.ttf
									
									
									
										generated
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								src/public/fonts/Montserrat-SemiBold.ttf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								src/public/fonts/Montserrat-SemiBold.ttf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							@ -6,7 +6,7 @@
 | 
			
		||||
 | 
			
		||||
@font-face {
 | 
			
		||||
    font-family: Montserrat;
 | 
			
		||||
    src: url(../fonts/Montserrat-Regular.ttf);
 | 
			
		||||
    src: url(../fonts/Montserrat-SemiBold.ttf);
 | 
			
		||||
    font-weight: bold;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user