|  Erik Johnston | 0e938b1ff7 | Rename method name to not clash with other ones in storage. | 2014-08-15 16:47:48 +01:00 | 
				
					
						|  Erik Johnston | c5f2da5875 | Add a check to make sure that during state conflict res we only request a PDU we don't have. | 2014-08-15 11:47:01 +01:00 | 
				
					
						|  Erik Johnston | 1a26905cc9 | Fix pontenial bug in state resolution handler that compared dicts rather than their id's | 2014-08-15 11:41:20 +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 |