Merge branch 'archive' into archive-update-v0.53.2

This commit is contained in:
Eliot Partridge
2019-09-17 22:20:48 -05:00
113 changed files with 3698 additions and 3719 deletions
+3 -2
View File
@@ -8,8 +8,9 @@
"host": "http://localhost:8090/",
"local": "localhost:8090",
"adminLocal": "localhost:8091",
"proxy": false,
"secret": "<some_random_string_here>",
"token": "<some_random_string_here>",
"token": "<some_other_random_string_here>",
"db": "mongodb://<username>:<password>@localhost:27017/<database_name>",
"oauth": {
"google": {
@@ -31,4 +32,4 @@
}
}
]
}
}