Merge branch 'master' of bitbucket.org:signum/debshots
Conflicts: README.Developer app/views/packages/details.slim bin/get-data-from-old-live-server.sh
This commit is contained in:
commit
4abfb29599
10 changed files with 63 additions and 12 deletions
|
|
@ -9,8 +9,8 @@ development:
|
|||
adapter: postgresql
|
||||
database: debshots_dev
|
||||
username: debshots
|
||||
password: GonwannEn0
|
||||
host: localhost
|
||||
password: shootme
|
||||
host: torf
|
||||
pool: 5
|
||||
timeout: 5000
|
||||
|
||||
|
|
@ -21,8 +21,8 @@ test:
|
|||
adapter: postgresql
|
||||
database: debshots_test
|
||||
username: debshots
|
||||
password: GonwannEn0
|
||||
host: localhost
|
||||
password: shootme
|
||||
host: torf
|
||||
pool: 5
|
||||
timeout: 5000
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue