Merge remote-tracking branch 'upstream/master' 
						
					 
				 
				2017-08-07 22:43:52 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Set default From address in config ( #3756 ) 
						
					 
				 
				2017-07-07 00:12:12 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge remote-tracking branch 'upstream/master' 
						
					 
				 
				2017-08-07 22:43:52 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Fix JS errors and add back commit hash 
						
					 
				 
				2017-07-25 21:54:12 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Add unfollow modal (optional) ( #4246 ) 
						
					 
				 
				2017-07-18 17:14:43 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge upstream ( #111 ) 
						
					 
				 
				2017-08-01 13:20:29 -07:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge upstream ( #111 ) 
						
					 
				 
				2017-08-01 13:20:29 -07:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge remote-tracking branch 'upstream/master' 
						
					 
				 
				2017-08-07 22:43:52 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Change RuboCop rules to loose ( #4464 ) 
						
					 
				 
				2017-07-31 15:19:13 +02:00