Merge branch 'dev' into dns2

This commit is contained in:
Michael Kuron authored and GitHub committed 2017-07-23 10:10:36 +02:00
commit fcbbfe71bb
41 files changed
+2194 -812

No files matched your search

+1 -1
View File
@@ -29,7 +29,7 @@
<link rel="shortcut icon" href="/favicon.png" type="image/png">
<link rel="icon" href="/favicon.png" type="image/png">
</head>
<body style="padding-top: 70px;">
<body style="padding-top: 70px;" id="top">
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container-fluid">
<div class="navbar-header">