Merge remote-tracking branch master into patch-10 to resolve merge conflicts

This commit is contained in:
Ranlvor 2018-06-18 17:59:43 +02:00
commit 86f03ad3ef
Signed by untrusted user who does not match committer: Ranlvor
GPG key ID: 5E12D04750EF6F8E
9 changed files with 298 additions and 1259 deletions

View file

@ -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",