Mark Felder 6ef145b4fc Merge branch 'develop' into feature/digest-email		2019-06-03 15:29:53 -05:00
..
bbs	…
captcha	…
config	…
conversation	…
emails	Merge develop	2019-05-29 18:18:22 +03:00
gopher	…
http	Use Pleroma.Config everywhere	2019-05-30 15:33:58 +07:00
instances	…
object	kill @httpoison	2019-05-25 04:24:21 +00:00
plugs	Use Pleroma.Config everywhere	2019-05-30 15:33:58 +07:00
upload	…
uploaders	kill @httpoison	2019-05-25 04:24:21 +00:00
user	Merge branch 'develop' into feature/digest-email	2019-06-03 15:29:53 -05:00
web	Merge branch 'develop' into feature/digest-email	2019-06-03 15:29:53 -05:00
PasswordResetToken.ex	…
activity.ex	…
application.ex	Merge develop	2019-05-29 18:18:22 +03:00
bookmark.ex	…
clippy.ex	…
config.ex	…
conversation.ex	Accept question objects for conversations	2019-05-21 17:33:54 +03:00
digest_email_worker.ex	Replace Application.get_env/2 with Pleroma.Config.get/1	2019-05-29 21:31:27 +03:00
emoji.ex	Use Pleroma.Config everywhere	2019-05-30 15:33:58 +07:00
filter.ex	…
flake_id.ex	…
formatter.ex	Mention all people in the beginning of DM	2019-05-24 20:34:23 +00:00
html.ex	Use Pleroma.Config everywhere	2019-05-30 15:33:58 +07:00
instances.ex	…
jwt.ex	…
keys.ex	move key generation functions into Pleroma.Keys module	2019-05-22 03:58:15 +00:00
list.ex	…
mime.ex	…
notification.ex	Merge branch 'develop' into feature/digest-email	2019-06-03 15:29:53 -05:00
object.ex	Resolve merge conflicts	2019-06-01 16:29:58 +03:00
object_tombstone.ex	…
pagination.ex	…
quantum_scheduler.ex	…
registration.ex	…
repo.ex	…
reverse_proxy.ex	reverse proxy: clean up some @hackney leftovers	2019-06-02 09:09:58 +00:00
scheduled_activity.ex	…
scheduled_activity_worker.ex	…
signature.ex	move key generation functions into Pleroma.Keys module	2019-05-22 03:58:15 +00:00
stats.ex	…
thread_mute.ex	…
upload.ex	…
user.ex	Merge branch 'develop' into feature/digest-email	2019-06-03 15:29:53 -05:00
user_invite_token.ex	…