https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bfe220c 624231c)
Merge branch 'develop' into show_image_upload_limit
authorMarek Bachmann <marek.bachmann@comtec.eecs.uni-kassel.de>
Mon, 28 Nov 2022 23:28:05 +0000 (00:28 +0100)
committerMarek Bachmann <marek.bachmann@comtec.eecs.uni-kassel.de>
Mon, 28 Nov 2022 23:28:05 +0000 (00:28 +0100)

Trivial merge
mirror https://github.com/friendica/friendica.git