summaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2016-07-01 18:31:51 +0200
committerGitHub <noreply@github.com>2016-07-01 18:31:51 +0200
commit5b4cea4b366e9420a70cad4b817c1594da2ad0fe (patch)
tree56ae6180e876296b45e512d8184b8fc7fd08192e /resources
parent1d96fc9f78f7619995ab803f40395fb1a9accd7e (diff)
parent179a355b2cd3dc489a54cc27fd717f67373d0b1e (diff)
downloadnextcloud-server-5b4cea4b366e9420a70cad4b817c1594da2ad0fe.tar.gz
nextcloud-server-5b4cea4b366e9420a70cad4b817c1594da2ad0fe.zip
Merge pull request #275 from nextcloud/master-sync-upstream
[Master] Sync upstream
Diffstat (limited to 'resources')
0 files changed, 0 insertions, 0 deletions