summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-09-30 15:08:53 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2013-09-30 15:08:53 +0200
commit4d79e7e6733d06da6f4d7f0c44ef95a2a96c4aae (patch)
tree5556fd4f3d9c638bb11cdad4c1aed31e09b9263d /build
parent54965ce065ba7447cee2f4f60fe1babcc7371214 (diff)
parent480aeb804fc64be6fdcb1551f89e21304e270b33 (diff)
downloadnextcloud-server-4d79e7e6733d06da6f4d7f0c44ef95a2a96c4aae.tar.gz
nextcloud-server-4d79e7e6733d06da6f4d7f0c44ef95a2a96c4aae.zip
Merge branch 'master' into encryption_improved_error_messages_4617
Diffstat (limited to 'build')
0 files changed, 0 insertions, 0 deletions