Egor Kislitsyn 305d219413 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs ... # Conflicts: # lib/pleroma/web/federator/federator.ex # lib/pleroma/web/websub/websub.ex		2019-02-11 13:54:21 +07:00
..
captcha
config
emails
gopher
http
instances
plugs
upload
uploaders
user
web	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs	2019-02-11 13:54:21 +07:00
activity.ex
application.ex
clippy.ex
config.ex
emoji.ex
filter.ex
flake_id.ex
formatter.ex
html.ex
instances.ex
jobs.ex
list.ex
mime.ex
notification.ex
object.ex	Merge branch 'fix/credo-issues' into 'develop'	2019-02-10 20:54:21 +00:00
object_tombstone.ex
PasswordResetToken.ex
repo.ex
reverse_proxy.ex
stats.ex
upload.ex
user.ex	Merge branch 'fix/credo-issues' into 'develop'	2019-02-10 20:54:21 +00:00
user_invite_token.ex