Merge branch 'master' into sortLabels

src/components/Controls.vue

@@ -61,8 +61,7 @@
 					<template>
 						<div class="filter">
 							<h3>{{ t('deck', 'Filter by tag') }}</h3>
-							{{ filter }}
-							<div v-for="label in labelsSorted" :key="label.id" class="filter--item">
+							<div v-for="label in board.labels" :key="label.id" class="filter--item">
 								<input
 									:id="label.id"
 									v-model="filter.tags"