summaryrefslogtreecommitdiff
path: root/lib/mix/tasks
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-10-13 09:54:11 -0500
committerMark Felder <feld@FreeBSD.org>2020-10-13 09:54:11 -0500
commit4ead0d564fa60b1a908f6237474250d6bda85ae9 (patch)
tree4a7852367e339f6759ccbabe70d6670e52cf171f /lib/mix/tasks
parent8bacdc36806efd01a7897359ff0fd2c8e24730d2 (diff)
parent8b6221d4ecd1d7e354e7de831dd46e285cb85077 (diff)
downloadpleroma-4ead0d564fa60b1a908f6237474250d6bda85ae9.tar.gz
pleroma-4ead0d564fa60b1a908f6237474250d6bda85ae9.zip
Merge branch 'develop' into refactor/discoverable_user_field
Diffstat (limited to 'lib/mix/tasks')
-rw-r--r--lib/mix/tasks/pleroma/ecto.ex (renamed from lib/mix/tasks/pleroma/ecto/ecto.ex)0
-rw-r--r--lib/mix/tasks/pleroma/robots_txt.ex (renamed from lib/mix/tasks/pleroma/robotstxt.ex)0
2 files changed, 0 insertions, 0 deletions
diff --git a/lib/mix/tasks/pleroma/ecto/ecto.ex b/lib/mix/tasks/pleroma/ecto.ex
index 3363cd45f..3363cd45f 100644
--- a/lib/mix/tasks/pleroma/ecto/ecto.ex
+++ b/lib/mix/tasks/pleroma/ecto.ex
diff --git a/lib/mix/tasks/pleroma/robotstxt.ex b/lib/mix/tasks/pleroma/robots_txt.ex
index 24f08180e..24f08180e 100644
--- a/lib/mix/tasks/pleroma/robotstxt.ex
+++ b/lib/mix/tasks/pleroma/robots_txt.ex