|  Mark Haines | 357dd1871d | Merge branch 'develop' into storage_transactions Conflicts:
	tests/handlers/test_federation.py
	tests/handlers/test_room.py | 2014-08-27 17:28:55 +01:00 | 
				
					
						|  Erik Johnston | e111a06e0a | Fix tests. | 2014-08-27 17:21:48 +01:00 | 
				
					
						|  Mark Haines | a03c7f27a8 | Fill out prev_events before calling persist_event | 2014-08-27 14:32:19 +01:00 | 
				
					
						|  Kegan Dougal | 8bd55cfdcb | Fix ALL THE UNIT TESTS | 2014-08-26 15:54:25 +01:00 | 
				
					
						|  Erik Johnston | 5c4c591c61 | Fix federation test, since we now hit store.get_room | 2014-08-20 14:59:43 +01:00 | 
				
					
						|  Erik Johnston | 41333452e5 | Update tests | 2014-08-19 15:52:20 +01:00 | 
				
					
						|  Kegan Dougal | 9a1638ed21 | Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested. | 2014-08-14 10:18:54 +01:00 | 
				
					
						|  Matthew Hodgson | 3e35a9f96e | add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it | 2014-08-13 03:32:18 +01:00 | 
				
					
						|  matrix.org | 4f475c7697 | Reference Matrix Home Server | 2014-08-12 15:10:52 +01:00 |