diff options
author | Robin Appelman <icewind@owncloud.com> | 2014-02-21 16:07:21 +0100 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2014-02-21 16:07:21 +0100 |
commit | df35929ed22d066c9ab9f74fab2db8e38915534b (patch) | |
tree | 6c143dfdf89e0e56a2333b2972546acb914cc3b4 /core/js/core.json | |
parent | 58be2eb955b8c23a8698bdbb7bae8077eb402ee3 (diff) | |
parent | aa0bcf7ba45d004b0c0226fd07696f9f224f9c1c (diff) | |
download | nextcloud-server-df35929ed22d066c9ab9f74fab2db8e38915534b.tar.gz nextcloud-server-df35929ed22d066c9ab9f74fab2db8e38915534b.zip |
Merge branch 'master' into add-js-config-vars
Diffstat (limited to 'core/js/core.json')
0 files changed, 0 insertions, 0 deletions