feld 008499f65a Merge branch 'develop' into 'fix/2412-filters' ... # Conflicts: # CHANGELOG.md		2021-02-03 14:23:23 +00:00
..
admin	Merge branch 'feat/openapi-spec-export' into 'develop'	2021-02-03 13:21:19 +00:00
account_operation.ex	Merge branch 'feat/openapi-spec-export' into 'develop'	2021-02-03 13:21:19 +00:00
app_operation.ex
chat_operation.ex
conversation_operation.ex
custom_emoji_operation.ex
domain_block_operation.ex
emoji_reaction_operation.ex
filter_operation.ex	Merge branch 'develop' into 'fix/2412-filters'	2021-02-03 14:23:23 +00:00
follow_request_operation.ex
instance_operation.ex
list_operation.ex
marker_operation.ex
media_operation.ex
notification_operation.ex
pleroma_account_operation.ex
pleroma_backup_operation.ex
pleroma_conversation_operation.ex
pleroma_emoji_file_operation.ex
pleroma_emoji_pack_operation.ex
pleroma_instances_operation.ex
pleroma_mascot_operation.ex
pleroma_notification_operation.ex
pleroma_scrobble_operation.ex
poll_operation.ex
report_operation.ex
scheduled_activity_operation.ex
search_operation.ex
status_operation.ex	Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'	2021-02-03 14:22:23 +00:00
subscription_operation.ex
timeline_operation.ex	Merge branch 'feat/openapi-spec-export' into 'develop'	2021-02-03 13:21:19 +00:00
user_import_operation.ex