projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92135d0 ea214b8)
Merge branch 'feature/configurable-blocks' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 25 Jun 2018 06:12:29 +0000 (06:12 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 25 Jun 2018 06:12:29 +0000 (06:12 +0000)
Add more configurability to how blocks work

See merge request pleroma/pleroma!203

1  2 
CONFIGURATION.md patch | diff1 | diff2 | blob | history
config/config.exs patch | diff1 | diff2 | blob | history
lib/pleroma/user.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/activity_pub/activity_pub.ex patch | diff1 | diff2 | blob | history

diff --cc CONFIGURATION.md
Simple merge
diff --cc config/config.exs
Simple merge
diff --cc lib/pleroma/user.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git