projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0a9c63f
d1a6f67
)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma...
author
lain
<lain@soykaf.club>
Thu, 3 Sep 2020 09:29:39 +0000
(11:29 +0200)
committer
lain
<lain@soykaf.club>
Thu, 3 Sep 2020 09:29:39 +0000
(11:29 +0200)
1
2
lib/mix/tasks/pleroma/frontend.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/mix/tasks/pleroma/frontend.ex
Simple merge