summaryrefslogtreecommitdiffstats
path: root/ocs
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-11-12 23:36:59 +0100
committerThomas Tanghus <thomas@tanghus.net>2012-11-12 23:36:59 +0100
commit268a48479dd8cc14eaf3484043cf4857526ccab2 (patch)
treebe2fe2a161cf50eeadabfc2f7910db6590454fdf /ocs
parentc127c78df498214ed03982c9a406d8c52135123b (diff)
parent7b53c9d3f07bf630d38a7a9c92ee44a3fb9b0f21 (diff)
downloadnextcloud-server-268a48479dd8cc14eaf3484043cf4857526ccab2.tar.gz
nextcloud-server-268a48479dd8cc14eaf3484043cf4857526ccab2.zip
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Diffstat (limited to 'ocs')
0 files changed, 0 insertions, 0 deletions