Merge branch 'master' into enh/card-search

2020-02-04 12:26:50 +01:00
parent b567a744a6 2699a6cda7
commit f260884217
113 changed files with 994 additions and 1487 deletions
--- a/src/main.js
+++ b/src/main.js
@@ -26,7 +26,7 @@ import store from './store/main'
 import { sync } from 'vuex-router-sync'
 import { translate, translatePlural } from '@nextcloud/l10n'
 import { generateFilePath } from '@nextcloud/router'
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
+import Tooltip from '@nextcloud/vue'
 import ClickOutside from 'vue-click-outside'
 import './models'