summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-12-08 15:34:17 +0100
committerLukas Reschke <lukas@owncloud.com>2014-12-08 15:34:17 +0100
commit5f43809ace0068cd577959e4a522292ec3a1c9bb (patch)
treedf2d1d4792e08d3153f6891de61d419ed573425c /settings/js
parent8b3e3890628fa00d50c94af1131cbe3cd63e4a12 (diff)
parenteac0131d5ab6f5cb5f98595731d2bd8a17fe9b36 (diff)
downloadnextcloud-server-5f43809ace0068cd577959e4a522292ec3a1c9bb.tar.gz
nextcloud-server-5f43809ace0068cd577959e4a522292ec3a1c9bb.zip
Merge branch 'initial-work-migrate-to-appframework' of https://github.com/owncloud/core into initial-work-migrate-to-appframework
Diffstat (limited to 'settings/js')
0 files changed, 0 insertions, 0 deletions