Merge remote-tracking branch 'upstream/devel' into devel

This commit is contained in:
Xavier Priour 2015-12-13 20:02:51 +01:00
commit e304185c23
42 changed files with 542 additions and 316 deletions

View file

@ -50,7 +50,7 @@ Template.boardChangeTitlePopup.events({
BlazeComponent.extendComponent({
template() {
return 'headerBoard';
return 'boardHeaderBar';
},
isStarred() {
@ -94,7 +94,7 @@ BlazeComponent.extendComponent({
},
}];
},
}).register('headerBoard');
}).register('boardHeaderBar');
BlazeComponent.extendComponent({
template() {