diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-03-21 12:40:21 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-03-21 12:40:21 -0400 |
| commit | 2cf2c36d1e242487a4caabaa198ba8eecb35d3c5 (patch) | |
| tree | ff3e797c709c66ada312fd2dfdf7efb88385e035 /config | |
| parent | a3872e5f5ea59c78c9a1d8b4fcb77a418c6c25b6 (diff) | |
| parent | 82ffcf0723f9a4a430a486cd9e490ea4ed0764ff (diff) | |
| download | chat-2cf2c36d1e242487a4caabaa198ba8eecb35d3c5.tar.gz chat-2cf2c36d1e242487a4caabaa198ba8eecb35d3c5.tar.bz2 chat-2cf2c36d1e242487a4caabaa198ba8eecb35d3c5.zip | |
Merge pull request #2493 from mattermost/plt-1840
PLT-1840 Better build system.
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/config.json b/config/config.json index 1735ca293..65a61bb72 100644 --- a/config/config.json +++ b/config/config.json @@ -87,8 +87,8 @@ "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS", "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL", "SendPushNotifications": false, - "PushNotificationContents": "generic", - "PushNotificationServer": "" + "PushNotificationServer": "", + "PushNotificationContents": "generic" }, "RateLimitSettings": { "EnableRateLimiter": true, @@ -146,4 +146,4 @@ "Directory": "./data/", "EnableDaily": false } -} +}
\ No newline at end of file |