Ivan Tashkinov 4e14945670 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/activity_pub/activity_pub.ex		2021-02-03 09:31:38 +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	[#3213] Explicitly defined PKs in hashtags_objects and data_migration_failed_ids. Added "pleroma.database rollback" task to revert a single migration.	2021-01-31 22:03:59 +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	Merge branch 'develop' into refactor/deactivated_user_field	2021-01-18 14:58:21 -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
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