Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2019-03-20 13:54:00 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add WebP support ( #9879 ) 
						
					 
				 
				2019-02-02 12:25:04 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add profile directory ( #9427 ) 
						
					 
				 
				2018-12-06 17:36:11 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Use Contact User as Relay, Report, Subscribe. ( #9661 ) 
						
					 
				 
				2019-01-05 07:17:12 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add WebP support ( #9879 ) 
						
					 
				 
				2019-02-02 12:25:04 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge branch 'master' into glitch-soc/merge-upstream 
						
					 
				 
				2018-11-27 13:23:02 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Restore support to ruby 2.3, add ruby 2.3 to circle ci ( #7935 ) 
						
					 
				 
				2018-07-03 19:47:09 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix cache_associated no longer working ( #7320 ) 
						
					 
				 
				2018-05-03 10:41:41 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add option to overwrite imported data ( #9962 ) 
						
					 
				 
				2019-02-03 03:59:51 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix poll update handler calling method was that was not available ( #10246 ) 
						
					 
				 
				2019-03-12 22:58:59 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Refactor User model, extract PamAuthenticable, LdapAuthenticable ( #10217 ) 
						
					 
				 
				2019-03-14 02:13:42 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Refactor User model, extract PamAuthenticable, LdapAuthenticable ( #10217 ) 
						
					 
				 
				2019-03-14 02:13:42 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix timeline pagination ( #8827 ) 
						
					 
				 
				2018-09-29 19:03:33 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Refactor User model, extract PamAuthenticable, LdapAuthenticable ( #10217 ) 
						
					 
				 
				2019-03-14 02:13:42 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Create Redisable#redis ( #9633 ) 
						
					 
				 
				2019-02-02 19:11:38 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Cache relationships in API ( #6482 ) 
						
					 
				 
				2018-02-18 03:14:46 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix nil host in remotable ( #8508 ) 
						
					 
				 
				2018-08-29 21:13:49 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Improved remote thread fetching ( #10106 ) 
						
					 
				 
				2019-02-28 15:22:21 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Define instance method outside #included ( #3128 ) 
						
					 
				 
				2017-05-19 11:41:45 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Refactor User model, extract PamAuthenticable, LdapAuthenticable ( #10217 ) 
						
					 
				 
				2019-03-14 02:13:42 +01:00