Martin Lablans
							
						 
					 | 
					
						
						
							
						
						f8b9aed7f5
					 | 
					
						
						
							
							Cleaning
						
						
						
						
						
						
					 | 
					
						2022-10-17 15:09:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patrick Skowronek
							
						 
					 | 
					
						
						
							
						
						411edbf0e7
					 | 
					
						
						
							
							Merge branch 'version-1' into develop
						
						
						
						
						
						
					 | 
					
						2022-07-12 11:06:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patrick Skowronek
							
						 
					 | 
					
						
						
							
						
						d36ad9b4e3
					 | 
					
						
						
							
							Fix some more merge conflicts and some improvements
						
						
						
						
						
						
					 | 
					
						2022-05-05 14:17:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								root
							
						 
					 | 
					
						
						
							
						
						eb1f791f72
					 | 
					
						
						
							
							Merge branch 'version-1' into feature/bd-29
						
						
						
						
						
						
						
						Conflicts:
	.gitignore
	README.md
	auth/dktk
	dktk-fed/docker-compose.yml
	landing/index.html
	lib/generate.sh 
						
						
					 | 
					
						2022-05-04 09:22:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								root
							
						 
					 | 
					
						
						
							
						
						8c5e8ed833
					 | 
					
						
						
							
							Cleanup of old files
						
						
						
						
						
						
						
						Moved c4 and dktk to ccp 
						
						
					 | 
					
						2022-05-02 16:19:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								root
							
						 
					 | 
					
						
						
							
						
						5bacdf02fb
					 | 
					
						
						
							
							Added user bridgehead and made changes to run bridghead as this user
						
						
						
						
						
						
					 | 
					
						2022-03-25 10:41:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patrick Skowronek
							
						 
					 | 
					
						
						
							
						
						3a9ed42327
					 | 
					
						
						
							
							Enforce https and some cleanup
						
						
						
						
						
						
					 | 
					
						2022-03-18 10:52:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								root
							
						 
					 | 
					
						
						
							
						
						872a2f2504
					 | 
					
						
						
							
							Readded .gitignore
						
						
						
						
						
						
					 | 
					
						2022-03-01 11:35:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								root
							
						 
					 | 
					
						
						
							
						
						86bf076869
					 | 
					
						
						
							
							Added missing gitignore
						
						
						
						
						
						
					 | 
					
						2022-03-01 11:31:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Martin Lablans
							
						 
					 | 
					
						
						
							
						
						3bab2f6dfd
					 | 
					
						
						
							
							Correctly ignore site-specific config
						
						
						
						
						
						
					 | 
					
						2022-01-10 15:12:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Martin Lablans
							
						 
					 | 
					
						
						
							
						
						1658e7357b
					 | 
					
						
						
							
							Correctly ignore git submodules
						
						
						
						
						
						
					 | 
					
						2022-01-10 15:11:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								root
							
						 
					 | 
					
						
						
							
						
						ed2f2ad590
					 | 
					
						
						
							
							Added files for running a gbn project
						
						
						
						
						
						
					 | 
					
						2021-12-21 13:48:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |