Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend
[akkoma] / lib / pleroma / web / web_finger /
drwxr-xr-x   ..
-rw-r--r-- 8238 web_finger.ex
-rw-r--r-- 1097 web_finger_controller.ex