rinpatch 72f3b22134 Merge branch 'domain-block-precedence' into 'develop' ... make follows take precedence over domain blocks See merge request pleroma/pleroma!2019		2019-12-11 09:57:00 +00:00
..
activity	status search: prefer the status fetched by url over other results	2019-12-09 20:45:04 +03:00
bbs	…
captcha	…
config	…
conversation	…
daemons	…
docs	…
emails	…
emoji	…
gopher	…
helpers	…
http	…
instances	…
object	…
plugs	[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.	2019-12-11 11:42:02 +03:00
reverse_proxy	…
upload	…
uploaders	…
user	Merge branch 'develop' into issue/1342	2019-12-08 21:25:26 +03:00
web	Merge branch 'domain-block-precedence' into 'develop'	2019-12-11 09:57:00 +00:00
workers	…
activity.ex	…
activity_expiration.ex	…
application.ex	…
bookmark.ex	…
clippy.ex	…
config.ex	[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.	2019-12-11 11:42:02 +03:00
constants.ex	…
conversation.ex	…
delivery.ex	…
ecto_enums.ex	…
emoji-data.txt	…
emoji.ex	…
filter.ex	…
following_relationship.ex	…
formatter.ex	…
healthcheck.ex	…
html.ex	…
instances.ex	…
job_queue_monitor.ex	…
jwt.ex	…
keys.ex	…
list.ex	…
marker.ex	…
mime.ex	…
moderation_log.ex	…
notification.ex	…
object.ex	…
object_tombstone.ex	…
pagination.ex	…
password_reset_token.ex	…
registration.ex	…
release_tasks.ex	…
repo.ex	…
repo_streamer.ex	…
scheduled_activity.ex	…
scheduler.ex	…
signature.ex	…
stats.ex	…
thread_mute.ex	…
upload.ex	…
user.ex	Apply suggestion to lib/pleroma/user.ex	2019-12-10 18:49:41 +00:00
user_invite_token.ex	…
user_relationship.ex	…