summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@owncloud.org>2012-09-16 17:14:04 +0200
committerFrank Karlitschek <frank@owncloud.org>2012-09-16 17:14:04 +0200
commitf17555285e26b692170a724b3141c7304f252c95 (patch)
treeb5417275674e166f125ee4c473683fe96308b39a /settings
parent9d533fcd722512cfbc0b7bc547cc4eb822eaafdf (diff)
parent7da3492ab5afc2b3df95ddbc30be13edf6db6c32 (diff)
downloadnextcloud-server-f17555285e26b692170a724b3141c7304f252c95.tar.gz
nextcloud-server-f17555285e26b692170a724b3141c7304f252c95.zip
Merge branch 'master' of https://github.com/owncloud/core
Diffstat (limited to 'settings')
0 files changed, 0 insertions, 0 deletions