Merge branch 'develop' into feature/vm_pricing
This commit is contained in:
		
				commit
				
					
						f5978a7da9
					
				
			
		
					 6 changed files with 10 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -54,7 +54,6 @@ INSTALLED_APPS = (
 | 
			
		|||
    'django.contrib.sites',
 | 
			
		||||
    'easy_thumbnails',
 | 
			
		||||
    'utils',
 | 
			
		||||
    'ungleich_page',
 | 
			
		||||
    'mptt',
 | 
			
		||||
    'parler',
 | 
			
		||||
    'taggit',
 | 
			
		||||
| 
						 | 
				
			
			@ -104,6 +103,7 @@ INSTALLED_APPS = (
 | 
			
		|||
    'reversion',
 | 
			
		||||
    # ungleich
 | 
			
		||||
    'ungleich',
 | 
			
		||||
    'ungleich_page',
 | 
			
		||||
    'hosting',
 | 
			
		||||
    'digitalglarus',
 | 
			
		||||
    'django_extensions',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue