diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-03-05 19:58:22 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-03-05 19:58:22 +0200 |
| commit | 7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f (patch) | |
| tree | 5715424ab1454463a3f8ca458729347bbc014f5b /client/components/main/layouts.js | |
| parent | 7b68f1901e8bd81ec8fbebb60a3f4e057b57d06d (diff) | |
| parent | 39f2837838ba30ec02bfe9f33c9fa0dfca05d1a6 (diff) | |
| download | wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.tar.gz wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.tar.bz2 wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.zip | |
Fix merge conflict.
Diffstat (limited to 'client/components/main/layouts.js')
| -rw-r--r-- | client/components/main/layouts.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index 3df17f41..1e50b01a 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -1,4 +1,6 @@ Meteor.subscribe('boards'); +Meteor.subscribe('setting'); +Meteor.subscribe('user-admin'); BlazeLayout.setRoot('body'); |