Merge branch 'master' into anoa/as_forward_events

This commit is contained in:
Andrew Morgan 2018-06-11 04:58:42 -07:00 committed by GitHub
commit 5b713555c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,5 +1,3 @@
// Copyright 2018 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
@ -28,3 +26,8 @@ type ApplicationServiceWorkerState struct {
Cond *sync.Cond
EventsReady bool
}
const (
// AppServiceDeviceID is the AS dummy device ID
AppServiceDeviceID = "AS_Device"
)