remove applySettings hook and allow credentials.json to be part of core

This commit is contained in:
John McLear 2015-12-02 11:53:41 +00:00
parent f44c444720
commit 0617f81689
2 changed files with 4 additions and 0 deletions

1
.gitignore vendored
View File

@ -17,3 +17,4 @@ npm-debug.log
*.crt
*.key
bin/etherpad-1.deb
credentials.json

View File

@ -2,6 +2,9 @@
This file must be valid JSON. But comments are allowed
Please edit settings.json, not settings.json.template
To still commit settings without credentials you can
store any credential settings in credentials.json
*/
{
// Name your instance!