summaryrefslogtreecommitdiff
path: root/config/dev.exs
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-05-28 13:51:21 -0500
committerAlex Gleason <alex@alexgleason.me>2021-05-28 13:51:21 -0500
commit39127f15eb36c4fb41838a232f9d80c50416838d (patch)
treeda8cf563c6c4f5cfdaec14c4a5cddb808f0807e6 /config/dev.exs
parentc23b81e399d5be6fc30f4acb1d757d5eb291d8e1 (diff)
parent7ad87571bdcd39959280d15f5bfe4175e04c442c (diff)
downloadpleroma-39127f15eb36c4fb41838a232f9d80c50416838d.tar.gz
pleroma-39127f15eb36c4fb41838a232f9d80c50416838d.zip
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
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 4faaeff5b..cfe3cce47 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.