Dev Fxied gitignore

LimeSurvey · Apr 7, 2016 · d590e4f · d590e4f
1 parent e142dde
commit d590e4f
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,6 @@
 /upload/surveys/*
 /upload/templates/*
 /upload/labels/*
-!/upload/labels/readme.txt
 /tmp/runtime/HTML
 /application/controllers/admin/updater.php
 /tmp/*.html
@@ -16,7 +15,6 @@
 /nbproject
 /tmp/assets/*
 !/tmp/assets/.gitignore
-!/tmp/assets/index.html
 /tmp/runtime/cache/*
 .svn
 /third_party/jqgrid/src
@@ -25,3 +23,5 @@
 /application/config/config.php
 application/config/_config.php
 *.un~
+!index.html
+!readme.txt
diff --git a/docs/release_notes.txt b/docs/release_notes.txt
@@ -57,7 +57,7 @@ Changes from 2.50+ (build 160404) to 2.50+ (build 160405) Apr 05, 2016
 #Updated translation: Italian by lfanfoni
 #Updated translation: Italian (Informal) by lfanfoni
 #Updated translation: Kurdish (Sorani) by RastiK5
-#Updated translation: Norwegian (BokmÃ¥l) by pmonstad
+#Updated translation: Norwegian (Bokmal) by pmonstad
 #Updated translation: Norwegian (Nynorsk) by pmonstad
 #Updated translation: Polish by elisa
 #Updated translation: Polish (Informal) by elisa

diff --git a/upload/labels/index.html b/upload/labels/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>LimeSurvey</title>
+</head>
+<body>
+</body>
+</html>
+
+
+
diff --git a/upload/surveys/index.html b/upload/surveys/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>LimeSurvey</title>
+</head>
+<body>
+</body>
+</html>
+
+
+
diff --git a/upload/templates/index.html b/upload/templates/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>LimeSurvey</title>
+</head>
+<body>
+</body>
+</html>
+
+
+