Merge branch 'master' of gitlab.com:delkappa/delkappa
This commit is contained in:
		@ -5,7 +5,7 @@
 | 
				
			|||||||
<!--[if IE 8 ]><html class="no-js ie ie8" lang="en"> <![endif]-->
 | 
					<!--[if IE 8 ]><html class="no-js ie ie8" lang="en"> <![endif]-->
 | 
				
			||||||
<!--[if (gte IE 8)|!(IE)]><!-->
 | 
					<!--[if (gte IE 8)|!(IE)]><!-->
 | 
				
			||||||
<html class="no-js" lang="en"> <!--<![endif]-->
 | 
					<html class="no-js" lang="en"> <!--<![endif]-->
 | 
				
			||||||
<head>
 | 
					  <head>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <!--
 | 
					    <!--
 | 
				
			||||||
    Theme: Ceevee
 | 
					    Theme: Ceevee
 | 
				
			||||||
@ -64,9 +64,9 @@
 | 
				
			|||||||
    ================================================== -->
 | 
					    ================================================== -->
 | 
				
			||||||
    <link rel="shortcut icon" href="images/favicon.ico" >
 | 
					    <link rel="shortcut icon" href="images/favicon.ico" >
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</head>
 | 
					  </head>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<body>
 | 
					  <body>
 | 
				
			||||||
    <!-- Header
 | 
					    <!-- Header
 | 
				
			||||||
    Photo: Play Among The Stars
 | 
					    Photo: Play Among The Stars
 | 
				
			||||||
    By David L. Labrie — National Geographic Your Shot
 | 
					    By David L. Labrie — National Geographic Your Shot
 | 
				
			||||||
@ -451,7 +451,7 @@
 | 
				
			|||||||
    <script src="js/magnific-popup.js"></script>
 | 
					    <script src="js/magnific-popup.js"></script>
 | 
				
			||||||
    <script src="js/init.js"></script>
 | 
					    <script src="js/init.js"></script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</body>
 | 
					  </body>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</html>
 | 
					</html>
 | 
				
			||||||
>>>>>>> 0f28386bbab7b52ee21294ea5585484affea8891
 | 
					>>>>>>> 0f28386bbab7b52ee21294ea5585484affea8891
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user