aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/oauth/oauth_controller.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-06-11 11:19:45 +0000
committerlambda <pleromagit@rogerbraun.net>2018-06-11 11:19:45 +0000
commit7f79b467b1b56ce9ac7f544aaa2b687dcae341c5 (patch)
tree5c2b067d132fda185016982e1a8a1445eff0ce7d /lib/pleroma/web/oauth/oauth_controller.ex
parent45a935f0bd86501d64be7f453c08a47e46565ef9 (diff)
parent29c9c8d93b263e57915158d09761bc6586826798 (diff)
downloadpleroma-7f79b467b1b56ce9ac7f544aaa2b687dcae341c5.tar.gz
Merge branch 'feature/domain-blocks' into 'develop'
Domain blocks See merge request pleroma/pleroma!190
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
0 files changed, 0 insertions, 0 deletions