Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Creaprog/Mamix
Browse files Browse the repository at this point in the history
  • Loading branch information
@Codecombay
Codecombay committed Jun 10, 2014
2 parents d8d9167 + bdb5cc5 commit 844adb0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
5 changes: 1 addition & 4 deletions services/logs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
<!-- On ouvre la fenêtre à la largeur de l'écran -->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Intégration des CSS Bootstrap -->
<link href="../css/bootstrap.css" rel="stylesheet" media="screen">
<link href="../css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="../css/bootstrap-theme.css" rel="stylesheet" media="screen">
<link href="../css/bootstrap-theme.min.css" rel="stylesheet" media="screen">
<link href="/bootstrap-3.1.1-dist/css/bootstrap.min.css" rel="stylesheet" media="screen">
</head>
<body>
<!-- Intégration du header -->
Expand Down
5 changes: 1 addition & 4 deletions services/monitoring.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
<!-- On ouvre la fenêtre à la largeur de l'écran -->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Intégration des CSS Bootstrap -->
<link href="../css/bootstrap.css" rel="stylesheet" media="screen">
<link href="../css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="../css/bootstrap-theme.css" rel="stylesheet" media="screen">
<link href="../css/bootstrap-theme.min.css" rel="stylesheet" media="screen">
<link href="/bootstrap-3.1.1-dist/css/bootstrap.min.css" rel="stylesheet" media="screen">
</head>
<body>

Expand Down
5 changes: 1 addition & 4 deletions services/terminal.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
<!-- On ouvre la fenêtre à la largeur de l'écran -->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Intégration des CSS Bootstrap -->
<link href="../css/bootstrap.css" rel="stylesheet" media="screen">
<link href="../css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="../css/bootstrap-theme.css" rel="stylesheet" media="screen">
<link href="../css/bootstrap-theme.min.css" rel="stylesheet" media="screen">
<link href="/bootstrap-3.1.1-dist/css/bootstrap.min.css" rel="stylesheet" media="screen">
</head>
<body>
<!-- Intégration du header -->
Expand Down

0 comments on commit 844adb0

Please sign in to comment.