Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								10294b6082
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
							
							
							
							
							
							
							
							Conflicts:
	synapse/storage/_base.py 
							
						 | 
						
							2014-08-14 10:01:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								d05aa651f8
								
							
								
							
						 | 
						
							
							
								
								An initial hack at storing presence state-change mtimes in database and presenting age durations to clients/federation events
							
							
							
							
							
						 | 
						
							2014-08-13 19:19:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								baf04be5cf
								
							
								
							
						 | 
						
							
							
								
								Set datastore's .hs field in SQLBaseStore rather than in the toplevel DataStore mixed-in result class
							
							
							
							
							
						 | 
						
							2014-08-13 19:19:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								336987bb8d
								
							
								
							
						 | 
						
							
							
								
								Initial stab at refactoring the SQL tables, including rejigging some of the storage layer.
							
							
							
							
							
						 | 
						
							2014-08-13 18:03:41 +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 |