summaryrefslogtreecommitdiff
path: root/config/dev.exs
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-06-01 14:20:31 -0500
committerAlex Gleason <alex@alexgleason.me>2021-06-01 14:20:31 -0500
commitf6d2bd738d6cf4c495ba8fcd311ebf4705cf4343 (patch)
tree2c952a181713d063c91ec5e67c757903e08fd21b /config/dev.exs
parent8a5ceb7e53f1817f83a72b997f6b9daa7070972b (diff)
parentee52fc840d4d6eb1caab811a9b00ab1b95662d77 (diff)
downloadpleroma-f6d2bd738d6cf4c495ba8fcd311ebf4705cf4343.tar.gz
pleroma-f6d2bd738d6cf4c495ba8fcd311ebf4705cf4343.zip
Merge remote-tracking branch 'pleroma/develop' into cycles-uploader
Diffstat (limited to 'config/dev.exs')
-rw-r--r--config/dev.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/dev.exs b/config/dev.exs
index 8e7d5c587..6b7ffb0e9 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
# For development, we disable any cache and enable
# debugging and code reloading.