projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7b96a75
8696c25
)
Merge branch 'patch-2' into 'develop'
author
lambda
<pleromagit@rogerbraun.net>
Thu, 19 Apr 2018 14:30:13 +0000
(14:30 +0000)
committer
lambda
<pleromagit@rogerbraun.net>
Thu, 19 Apr 2018 14:30:13 +0000
(14:30 +0000)
Ignore setup_db.psql and specify a folder for custom emojis
See merge request pleroma/pleroma!121
Trivial merge
projects / akkoma / commitdiff