merge
authorHakaba Hitoyo <hakabahitoyo@example.com>
Thu, 19 Jul 2018 08:42:00 +0000 (17:42 +0900)
committerHakaba Hitoyo <hakabahitoyo@example.com>
Thu, 19 Jul 2018 08:42:00 +0000 (17:42 +0900)
commitcc9c062b553e20018e406dc605e6e504ad3134a6
tree9cf2a1e19697ceefa99671980f42901e0025eaa0
parentb12d17d2ce270e0d964f599efd4f16fba95b17ce
parent41b0ecef959df0a1cda71e56e256cacebe48d56f
merge
config/config.exs
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
lib/pleroma/web/router.ex