Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup
This commit is contained in:
		
				commit
				
					
						9261154eab
					
				
			
		
					 483 changed files with 23212 additions and 10894 deletions
				
			
		
							
								
								
									
										2
									
								
								boot.php
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								boot.php
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -17,6 +17,8 @@
 | 
			
		|||
 * easily as email does today.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
require_once('include/autoloader.php');
 | 
			
		||||
 
 | 
			
		||||
require_once('include/config.php');
 | 
			
		||||
require_once('include/network.php');
 | 
			
		||||
require_once('include/plugin.php');
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue