projects / akkoma / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 77f3da0 484ba5d)
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 23 Feb 2021 10:58:35 +0000 (13:58 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 23 Feb 2021 10:58:35 +0000 (13:58 +0300)
commit8f88a90ca3f2f2c7c341126f6816db9667664ea7
tree9bc009ad6e604941c3345d7e27acd58da19c57adtree | snapshot
parent77f3da035894e2add911101466bfe41b99ee481ecommit | diff
parent484ba5d062d93fd0cf4841e7743724928af5a2d9commit | diff
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
CHANGELOG.md diff1 | diff2 | blob | history
config/config.exs diff1 | diff2 | blob | history
lib/pleroma/application.ex diff1 | diff2 | blob | history
lib/pleroma/config.ex diff1 | diff2 | blob | history
Fork of https://akkoma.dev/AkkomaGang/akkoma.git