resolving merge conflicts

This commit is contained in:
IgnatzHome 2018-05-17 20:21:07 +02:00
commit 9518a5c11e
30 changed files with 880 additions and 58 deletions

View file

@ -75,6 +75,7 @@ Meteor.publishRelations('board', function(boardId) {
this.cursor(Lists.find({ boardId }));
this.cursor(Swimlanes.find({ boardId }));
this.cursor(Integrations.find({ boardId }));
this.cursor(CustomFields.find({ boardId }, { sort: { name: 1 } }));
// Cards and cards comments
// XXX Originally we were publishing the card documents as a child of the

View file

@ -0,0 +1,3 @@
Meteor.publish('customFields', function() {
return CustomFields.find();
});