diff options
| author | Marc Florisson | 2012-12-14 12:25:30 +0100 |
|---|---|---|
| committer | Marc Florisson | 2012-12-14 12:25:30 +0100 |
| commit | 783a183886fe9bd5a355cb08d18da43a3cc129eb (patch) | |
| tree | dc045bb8da408d7841214601bcdcf71a6e35e250 | |
| parent | e1d35c9b45135b48392b1ff4dff36a394b30aa3f (diff) | |
| parent | 07b7e4837c3050b26f39c7a6e38ef92c767f6e3b (diff) | |
| download | chouette-core-783a183886fe9bd5a355cb08d18da43a3cc129eb.tar.bz2 | |
Merge branch 'master' into api_key
| -rw-r--r-- | config/database.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/database.yml b/config/database.yml index ecff83b1f..9466851ef 100644 --- a/config/database.yml +++ b/config/database.yml @@ -8,8 +8,8 @@ development: adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %> database: chouette_dev encoding: utf8 - username: luc - password: monalisa + username: chouette + password: chouette # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". @@ -27,4 +27,4 @@ production: encoding: utf8 host: localhost username: chouette - password: chouette + password: chouette
\ No newline at end of file |