Merge remote-tracking branch 'origin/feature/checkbox-custom-template' into feature/checkbox-custom-template

# Conflicts:
#	src/components/Table.vue

Author: lucifilote

src/components/Table.vue

@@ -621,7 +621,7 @@ export default {
           !!this.$slots['table-checkbox-column'] ||
           !!this.$scopedSlots['table-checkbox-column']
       );
-    }
+    },
 
     showEmptySlot() {
       if (!this.paginated.length) return true;