Merge branch 'master' into owncloud
authorCamila Ayres <smayres@gmail.com>
Sun, 14 Oct 2018 14:13:01 +0000 (16:13 +0200)
committerGitHub <noreply@github.com>
Sun, 14 Oct 2018 14:13:01 +0000 (16:13 +0200)
commitaa388b86c0ff298950410c455f083399e4664d2e
treef20fce1716beb8389a4bd42c94d82293b03754f3
parentf9c6449c050cad673cf37971d9815a35e6ffb5dd
parentbfc8154e687dd9a351d3261994479ee2a994af6c
Merge branch 'master' into owncloud