projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a764e6f
9070588
)
Merge branch 'runtime-config' into 'develop'
author
kaniini
<nenolod@gmail.com>
Wed, 7 Nov 2018 22:32:34 +0000
(22:32 +0000)
committer
kaniini
<nenolod@gmail.com>
Wed, 7 Nov 2018 22:32:34 +0000
(22:32 +0000)
Runtime configuration
See merge request pleroma/pleroma!430
1
2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge