aboutsummaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-10-15 11:26:09 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-10-15 11:26:09 +0200
commit378e9f55f0722d7c314264a438280359995c6c68 (patch)
tree0bb2566792141f58a599e88e97f5a06ec05b4f01 /public
parent1e2d0394448e748436f5b0877cf6b867f663e1d0 (diff)
parentb23be98531baad8d591456c0f5f4c651a6a6c2ea (diff)
Merge branch 'patch-3' of https://github.com/Alkarex/FreshRSS into hotfixes
Diffstat (limited to 'public')
-rw-r--r--public/install.php1
-rw-r--r--public/themes/default/metadata.json4
2 files changed, 2 insertions, 3 deletions
diff --git a/public/install.php b/public/install.php
index 7b485e500..b85dfd8d5 100644
--- a/public/install.php
+++ b/public/install.php
@@ -655,7 +655,6 @@ case 5:
<title><?php echo _t ('freshrss_installation'); ?></title>
<link rel="stylesheet" type="text/css" media="all" href="themes/default/global.css" />
<link rel="stylesheet" type="text/css" media="all" href="themes/default/freshrss.css" />
- <link rel="stylesheet" type="text/css" media="all" href="themes/default/fallback.css" />
</head>
<body>
diff --git a/public/themes/default/metadata.json b/public/themes/default/metadata.json
index a69eab7ee..d316ec517 100644
--- a/public/themes/default/metadata.json
+++ b/public/themes/default/metadata.json
@@ -3,5 +3,5 @@
"author": "Marien Fressinaud",
"description": "Le thème par défaut pour FreshRSS",
"version": 0.1,
- "files": ["global.css", "freshrss.css", "fallback.css"]
-} \ No newline at end of file
+ "files": ["global.css", "freshrss.css"]
+}