summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-08-17 09:35:36 -0700
committerChristopher Speller <crspeller@gmail.com>2017-08-17 09:35:36 -0700
commitfd1301779fecc2910a9fdcf93af52ff33a4349ba (patch)
treeccd8b35d347b77c8c6a99db9422b3dbc0ff3bd2d /config
parentd41f1695e99a81808f5dc1fbe7820062947b5291 (diff)
parent0033e3e37b12cb5d951d21492500d66a6abc472b (diff)
downloadchat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.tar.gz
chat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.tar.bz2
chat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.zip
Merge branch 'release-4.1'
Diffstat (limited to 'config')
-rw-r--r--config/config.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json
index b8657d8d2..e7e67855a 100644
--- a/config/config.json
+++ b/config/config.json
@@ -310,4 +310,4 @@
"PluginSettings": {
"Plugins": {}
}
-}
+} \ No newline at end of file