projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a56db78
33bd8fb
)
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
author
rinpatch
<rinpatch@sdf.org>
Wed, 5 Feb 2020 16:59:21 +0000
(16:59 +0000)
committer
rinpatch
<rinpatch@sdf.org>
Wed, 5 Feb 2020 16:59:21 +0000
(16:59 +0000)
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
1
2
lib/pleroma/web/router.ex
patch
|
diff1
|
diff2
|
blob
|
history
mix.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/router.ex
Simple merge
diff --cc
mix.exs
Simple merge
projects / akkoma / commitdiff