Merge remote-tracking branch master into patch-10 to resolve merge conflicts
This commit is contained in:
commit
86f03ad3ef
9 changed files with 298 additions and 1259 deletions
|
|
@ -79,7 +79,7 @@ export const tradfri_remote = {
|
|||
}
|
||||
|
||||
export const esper_statistics = (name: string,
|
||||
prev_ui: Array<ControlUI> = []) => (
|
||||
prev_ui: Array<ControlUI> = []): Array<ControlUI> => (
|
||||
prev_ui.concat([
|
||||
{
|
||||
type: "section",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue