Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								54d0a75573
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into presence_logging
							
							
							
							
							
							
							
							Conflicts:
	synapse/handlers/presence.py 
							
						 | 
						
							2014-08-28 16:52:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								bddc1d9fff
								
							
								
							
						 | 
						
							
							
								
								use @wraps to set the __name__ __module__ and __doc__ correctly for logged functions
							
							
							
							
							
						 | 
						
							2014-08-28 15:32:38 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								b8b52ca09d
								
							
								
							
						 | 
						
							
							
								
								Add logging to try and figure out what is going on with the presence stuff
							
							
							
							
							
						 | 
						
							2014-08-28 14:58:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								f98e6380f1
								
							
								
							
						 | 
						
							
							
								
								add in whitespace after copyright statements to improve legibility
							
							
							
							
							
						 | 
						
							2014-08-13 03:14:34 +01:00 | 
						
					
				
					
						
							
							
								 
								matrix.org
							
						 | 
						
							
							
							
							
								
							
								4f475c7697
								
							
								
							
						 | 
						
							
							
								
								Reference Matrix Home Server
							
							
							
							
							
						 | 
						
							2014-08-12 15:10:52 +01:00 |