Ivan Tashkinov 5992382cf8 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md # lib/mix/tasks/pleroma/database.ex # lib/pleroma/web/templates/feed/feed/_activity.rss.eex		2021-02-11 19:31:57 +03:00
..
ecto	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
app.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
benchmark.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
config.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
count_statuses.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
database.ex	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-02-11 19:31:57 +03:00
digest.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
docs.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
ecto.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
email.ex	Also make this maybe_ for consistency	2021-02-04 14:33:49 -06:00
emoji.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
frontend.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
instance.ex	fix format	2021-01-28 10:20:25 +00:00
notification_settings.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
openapi_spec.ex	OpenAPI spec task: Load pleroma application to get version info	2021-02-09 22:10:09 +03:00
refresh_counter_cache.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
relay.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
robots_txt.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
uploads.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
user.ex	Ensure consistent behavior between pleroma.user activate/deactivate mix tasks	2021-01-25 10:48:28 -06:00