database.yml and .gitignore
database yml
one more try
Merge branch 'master' of ssh://mittenin.at/var/git/mercator
Merge branch 'master' of ssh://mittenin.at/var/git/mercator
Merge branch 'master' of ssh://mittenin.at/var/git/mercator
Merge branch 'master' of ssh://mittenin.at/var/git/mercator
Merge branch 'master' of ssh://mittenin.at/var/git/mercator
Merge branch 'master' of ssh://mittenin.at/var/git/mercator
Merge branch 'master' of ssh://mittenin.at/var/git/mercator
Merge branch 'master' of ssh://mittenin.at/var/git/mercator
Merge branch 'master' of ssh://mittenin.at/var/git/mercator
Merge branch 'master' of ssh://mittenin.at/var/git/mercator
Merge branch 'master' of ssh://mittenin.at/var/git/mercator
videochat