Manual merge of ungleich/master into opennebula-integration
This commit is contained in:
		
					parent
					
						
							
								d10285e23d
							
						
					
				
			
			
				commit
				
					
						d537fcb118
					
				
			
		
					 227 changed files with 25686 additions and 482 deletions
				
			
		
							
								
								
									
										3
									
								
								alplora/tests.py
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								alplora/tests.py
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
from django.test import TestCase
 | 
			
		||||
 | 
			
		||||
# Create your tests here.
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue