diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-04-17 19:45:16 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-04-17 19:45:16 +0200 |
| commit | ae7c9787cd8afd4313d356c6525e40d4ce79f99b (patch) | |
| tree | dbac8b756486c5266e914026ef5a679002d0eb85 /app/configuration | |
| parent | 044908439bdd7280f7539e12441d7dfa6c4d4c63 (diff) | |
| parent | 23dd73ddeec2473c3e8a3c517317e074ac53a1d8 (diff) | |
Merge branch 'releases'0.2.0
Diffstat (limited to 'app/configuration')
| -rw-r--r-- | app/configuration/.gitignore | 1 | ||||
| -rw-r--r-- | app/configuration/application.ini | 13 |
2 files changed, 1 insertions, 13 deletions
diff --git a/app/configuration/.gitignore b/app/configuration/.gitignore new file mode 100644 index 000000000..72e8ffc0d --- /dev/null +++ b/app/configuration/.gitignore @@ -0,0 +1 @@ +* diff --git a/app/configuration/application.ini b/app/configuration/application.ini deleted file mode 100644 index 2beb60324..000000000 --- a/app/configuration/application.ini +++ /dev/null @@ -1,13 +0,0 @@ -[general]
-environment = "development"
-use_url_rewriting = false
-sel_application = "flux rss lalala ~~~"
-
-base_url = "/~marien/rss/public" ; pas de slash à la fin /!\
-title = "FreshRSS"
-
-[db]
-host = "localhost"
-user = "bd"
-password = "bede"
-base = "marienfr_rss"
|