summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorRobin Appelman <icewind1991@gmail.com>2012-01-08 01:57:14 +0100
committerRobin Appelman <icewind1991@gmail.com>2012-01-08 01:57:14 +0100
commit799a7db638a71af91329c1781c482eacbd038ace (patch)
tree79869ded8a189502eeacaeafed762d6973eec65a /settings
parentd1edc360d9bd7d97c35d25b54dadec61004cd869 (diff)
parenta22b5feda6cf0dc4a4349f266371f95e91b62757 (diff)
downloadnextcloud-server-799a7db638a71af91329c1781c482eacbd038ace.tar.gz
nextcloud-server-799a7db638a71af91329c1781c482eacbd038ace.zip
Merge branch 'filesystem' of gitorious.org:owncloud/owncloud into filesystem
Diffstat (limited to 'settings')
0 files changed, 0 insertions, 0 deletions