|  | d269bb2d29 | Merge remote-tracking branch 'origin/master' into develop # Conflicts:
#	.gitignore | 2021-06-20 21:14:16 +01:00 |  | 
			
				
					|  | 29f9a7396a | Update to compose file, fixed line endings issue | 2021-06-20 21:05:25 +01:00 |  | 
			
				
					|  | 57ba2f515a | Added Asuro.pas to .gitignore Asuro.pas is generated at compile-time by the compilation script. | 2021-06-20 21:04:51 +01:00 |  | 
			
				
					|  | 7e9674a63d | Cleanup | 2020-10-29 15:27:40 +00:00 |  |