diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
| commit | 7f3bfdbe0c2442714bb5a14adfdeac1576123601 (patch) | |
| tree | 44962a914b86cf66a1da49300f12986db49f010e /model/config.go | |
| parent | 1626a6de6f16ba0878160b0a7eae9f49b8d34d4f (diff) | |
| parent | c7c644874e98db0ae83c5a44ec50ff811d9b3f46 (diff) | |
| download | chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.gz chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.bz2 chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.zip | |
Fixing merge
Diffstat (limited to 'model/config.go')
| -rw-r--r-- | model/config.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/model/config.go b/model/config.go index 1e95277a2..69f2127b2 100644 --- a/model/config.go +++ b/model/config.go @@ -58,7 +58,7 @@ type LogSettings struct { FileLocation string } -type ImageSettings struct { +type FileSettings struct { DriverName string Directory string EnablePublicLink bool @@ -123,7 +123,7 @@ type Config struct { TeamSettings TeamSettings SqlSettings SqlSettings LogSettings LogSettings - ImageSettings ImageSettings + FileSettings FileSettings EmailSettings EmailSettings RateLimitSettings RateLimitSettings PrivacySettings PrivacySettings |