summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-03-24 21:12:42 +0100
committerGitHub <noreply@github.com>2017-03-24 21:12:42 +0100
commit4f73911bab1e8f4614104b751eda0ad4834e7c5e (patch)
tree3159318684c15015ed4f13d9d5e5a349314fdd76 /core/js
parent3623431ac372b10e6613def018beb22d44a2e0d0 (diff)
parenta9c3692a9a11445b6efd7c986ed655b74990faa3 (diff)
downloadnextcloud-server-4f73911bab1e8f4614104b751eda0ad4834e7c5e.tar.gz
nextcloud-server-4f73911bab1e8f4614104b751eda0ad4834e7c5e.zip
Merge pull request #4041 from nextcloud/merge-systemtags-js
Merge systemtags JS
Diffstat (limited to 'core/js')
-rw-r--r--core/js/systemtags/merged.json7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/js/systemtags/merged.json b/core/js/systemtags/merged.json
new file mode 100644
index 00000000000..846ba967ed5
--- /dev/null
+++ b/core/js/systemtags/merged.json
@@ -0,0 +1,7 @@
+[
+ "systemtags.js",
+ "systemtagmodel.js",
+ "systemtagsmappingcollection.js",
+ "systemtagscollection.js",
+ "systemtagsinputfield.js"
+]