projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b7001ea
2b3f049
)
Merge branch 'feature/fe-configuration' into 'develop'
author
lambda
<pleromagit@rogerbraun.net>
Thu, 19 Jul 2018 07:31:10 +0000
(07:31 +0000)
committer
lambda
<pleromagit@rogerbraun.net>
Thu, 19 Jul 2018 07:31:10 +0000
(07:31 +0000)
serverside frontend configuration
See merge request pleroma/pleroma!256
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
projects / akkoma / commitdiff