mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-04 01:17:30 -05:00 
			
		
		
		
	Fixes for conflicts
This commit is contained in:
		
							parent
							
								
									2acd39c73e
								
							
						
					
					
						commit
						1cda49e6bb
					
				@ -51,7 +51,7 @@ class MailServiceProvider extends MailProvider
 | 
			
		||||
 | 
			
		||||
        });
 | 
			
		||||
    
 | 
			
		||||
        $this->app->afterResolving('mail.manager', function (MailManager $mailManager) {
 | 
			
		||||
        $this->app->afterResolving('mail.manager', function (GmailTransportManager $mailManager) {
 | 
			
		||||
            $mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
 | 
			
		||||
            return $mailManager;
 | 
			
		||||
        });
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user