Merge branch 'master' into feature/3517/ssh_keys
This commit is contained in:
		
				commit
				
					
						a2f705f012
					
				
			
		
					 14 changed files with 170 additions and 109 deletions
				
			
		| 
						 | 
				
			
			@ -119,7 +119,9 @@
 | 
			
		|||
        </div>
 | 
			
		||||
    </footer>
 | 
			
		||||
    {% else %}
 | 
			
		||||
        {% include "datacenterlight/includes/_footer.html" %}
 | 
			
		||||
        <div class="footer-light">
 | 
			
		||||
            {% include "datacenterlight/includes/_footer.html" %}
 | 
			
		||||
        </div>
 | 
			
		||||
    {% endif %}
 | 
			
		||||
    <!-- jQuery -->
 | 
			
		||||
    <script src="{% static 'hosting/js/jquery.js' %}"></script>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue