diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-18 10:42:56 +0000 | 
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-18 10:42:56 +0000 | 
| commit | b6ae412fcd7c67d64dd1467e8e35d17140e992df (patch) | |
| tree | 9b1239247d38a2aaa60627fc9bd4db44ed67d136 /config | |
| parent | 3879500c87829a5cf1377ca7ccdb7bf92c75367f (diff) | |
| parent | b1860fe85af1d32de937f466ba65d03614952e31 (diff) | |
| download | pleroma-b6ae412fcd7c67d64dd1467e8e35d17140e992df.tar.gz pleroma-b6ae412fcd7c67d64dd1467e8e35d17140e992df.zip  | |
Merge branch 'runtime-static-plug' into 'develop'
Instance/Runtime static plug
See merge request pleroma/pleroma!567
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | 
1 files changed, 1 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 036f1ac0b..e4b31bf81 100644 --- a/config/config.exs +++ b/config/config.exs @@ -110,6 +110,7 @@ config :pleroma, :instance,    public: true,    quarantined_instances: [],    managed_config: true, +  static_dir: "instance/static/",    allowed_post_formats: [      "text/plain",      "text/html",  | 
