Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'trystant/master' into feature/merge-try…
…stant-master * trystant/master: (28 commits) Updated Postgres system requirement for #22 Updated README.md installation process Updated README.md with testing info Updated README to remove supertest Added codeclimate test coverage badge; #20 Changed Markdown version to HTML for README.md #20 Updated README.md and removed unused code; #20 Changed lcov.info location for code climate; #20 Added commands to generate lcov data; #20 Added config variables to help test coverage; #20 Added istanbul & configured for test coverage; #20 Added Code Climate badge; #20 Added CodeClimate badge to the README.md; #20 Remove console.log from AccountSpec; #10 Added diagnostics to account spec #10 Changed "127.0.0.1" to "localhost"; #10 Manually create database; #10 Quoted replacement values Changed echo to cat #10 Updated script to show template output; #10 ... # Conflicts: # .travis.yml # README.md # app.js # config/config.json.tmpl # models/Account.js # package.json
- Loading branch information