Permalink
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
2 parents 0e7f4e2 + c274534 commit 175bf9c39d21fec7ddd1df4ebefbdae2eb907d3d @useo committed Jun 29, 2011
Showing with 4 additions and 4 deletions.
  1. +4 −4 config/database.yml
View
@@ -3,8 +3,8 @@
development:
adapter: mysql2
database: stizun-final
- username: root
- password: q1w2
+ username:
+ password:
pool: 5
timeout: 5000
@@ -16,8 +16,8 @@ development:
test: &TEST
adapter: mysql2
database: stizun_test
- username: root
- password: q1w2
+ username:
+ password:
pool: 5
timeout: 5000

0 comments on commit 175bf9c

Please sign in to comment.