Merge pull request #12360 from owncloud/files-tags

Add favorites to files app

diff --cc core/js/core.json
index e529315fdb18352725860a8667986a464ebcab75,88b903d43c4341c7fbf12a4caac114d41bbd2552..d3a9e2404e832568012e0b38ec4eb6a21f9901a3
--- 1/core/js/core.json
--- 2/core/js/core.json
+++ b/core/js/core.json
@@@ -2,11 -2,12 +2,12 @@@
        "vendor": [
                "jquery/jquery.min.js",
                "jquery/jquery-migrate.min.js",
 +              "jquery-ui/ui/jquery-ui.custom.js",
                "underscore/underscore.js",
-               "moment/min/moment-with-locales.js"
+               "moment/min/moment-with-locales.js",
+               "handlebars/handlebars.js"
        ],
        "libraries": [
 -              "jquery-ui-1.10.0.custom.js",
                "jquery-showpassword.js",
                "jquery-tipsy.js"
        ],

diff --cc core/js/js.js
Simple merge