Download as
Browse Code »

Commit 7f6f9c69ca679fa30b051583770f433517cb8557

Authored by José Maria Villac Pinheiro
2 parents 2c0df385 95ceb7ad
Exists in master and in 1 other branch Branch_8238183

Merge remote-tracking branch 'remotes/origin/master' 

# Conflicts:
#	config/prod.js
#	services/databases.js
Showing 1 changed file with 0 additions and 1 deletions   Show diff stats
config/prod.js
  Diff comments   View file @7f6f9c6
1 1 // prod.js - production keys here!!
2 2 // dev.js - Development keys - don't commit this!!!
3 3 module.exports = {
4   - googleClientID:
5 4 pg: {
6 5 host: process.env.PG_HOST, // server name or IP address;
7 6 hostaddr: process.env.PG_HOST_ADDRESS,
... ...