]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c760e0 2ba34cb)
Merge remote-tracking branch 'origin/master' into dependabot/composer/vimeo/psalm...
authorDaniel Kesselberg <mail@danielkesselberg.de>
Thu, 22 Oct 2020 12:43:01 +0000 (14:43 +0200)
committerDaniel Kesselberg <mail@danielkesselberg.de>
Thu, 22 Oct 2020 12:43:01 +0000 (14:43 +0200)
# Conflicts:
# build/psalm-baseline.xml


Trivial merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server