diff options
| author | michael pereira | 2011-03-04 03:21:32 +0100 |
|---|---|---|
| committer | michael pereira | 2011-03-04 03:21:32 +0100 |
| commit | e2db1dc442e9f28fe666537a8af024c810912bb4 (patch) | |
| tree | de16d36dff50a950dd963788689e18576a6db02f /application/configs | |
| parent | Inserted deleteForm (diff) | |
| parent | Änderungen an den Filtern (diff) | |
| download | pbs2-e2db1dc442e9f28fe666537a8af024c810912bb4.tar.gz pbs2-e2db1dc442e9f28fe666537a8af024c810912bb4.tar.xz pbs2-e2db1dc442e9f28fe666537a8af024c810912bb4.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Conflicts:
.zfproject.xml
Diffstat (limited to 'application/configs')
| -rw-r--r-- | application/configs/application.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/configs/application.ini b/application/configs/application.ini index 9bfaec2..6970da3 100644 --- a/application/configs/application.ini +++ b/application/configs/application.ini @@ -10,7 +10,7 @@ resources.frontController.params.displayExceptions = 0 resources.db.adapter = PDO_MYSQL resources.db.params.host = localhost resources.db.params.username = root -resources.db.params.password = 123456 +resources.db.params.password = lsfks resources.db.params.dbname = pbs resources.db.isDefaultTableAdapter = true |