]> source.dussan.org Git - nextcloud-server.git/commit
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)
commit277038a1f3e43584ff24ab1b0363f41f85921440
tree58624e51c9d928402df91e0a8c378564a72e492d
parent4c760e00765b7923239d2b8b357203186c8e4dc0
parent2ba34cba2c571c8a3e5315b79b8a627af2079ab6
Merge remote-tracking branch 'origin/master' into dependabot/composer/vimeo/psalm-4.0.1

# Conflicts:
# build/psalm-baseline.xml