lain 67d8df04a4 Merge branch '1335-user-api-id-fields-relations' into 'develop' ... [#1335] User: refactoring of AP ID fields into relations Closes #1335 See merge request pleroma/pleroma!1963		2019-12-05 17:16:23 +00:00
..
activity
bbs
captcha
config
conversation
daemons
docs
emails
emoji
gopher
helpers
http
instances
object
plugs
reverse_proxy
upload
uploaders
user
web	Merge branch '1335-user-api-id-fields-relations' into 'develop'	2019-12-05 17:16:23 +00:00
workers
activity_expiration.ex
activity.ex	Merge branch 'feature/move-activity' into 'develop'	2019-12-02 16:26:19 +00:00
application.ex	add ability to set a custom user-agent string	2019-11-25 09:53:11 +00:00
bookmark.ex
clippy.ex
config.ex
constants.ex
conversation.ex
delivery.ex
ecto_enums.ex
emoji-data.txt
emoji.ex
filter.ex
following_relationship.ex	Merge branch 'feature/move-activity' into 'develop'	2019-12-02 16:26:19 +00:00
formatter.ex
healthcheck.ex
html.ex	Update Floki dependency	2019-12-02 13:38:35 +07:00
instances.ex
job_queue_monitor.ex
jwt.ex
keys.ex
list.ex
marker.ex
mime.ex
moderation_log.ex
notification.ex	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-12-04 18:56:31 +03:00
object_tombstone.ex
object.ex
pagination.ex
password_reset_token.ex
registration.ex
release_tasks.ex
repo_streamer.ex
repo.ex
scheduled_activity.ex
scheduler.ex
signature.ex
stats.ex
thread_mute.ex
upload.ex
user_invite_token.ex
user_relationship.ex
user.ex	[#1335] Merge issue fix.	2019-12-04 19:41:14 +03:00