Merge remote-tracking branch 'origin/develop' into dbkr/electron_3

This commit is contained in:
David Baker 2016-11-03 13:32:01 +00:00
commit fb3ca441ba
4 changed files with 66 additions and 56 deletions

View file

@ -1,7 +1,8 @@
// @flow
/*
Copyright 2016 Aviral Dasgupta and OpenMarket Ltd
Copyright 2016 Aviral Dasgupta
Copyright 2016 OpenMarket Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

View file

@ -1,7 +1,8 @@
// @flow
/*
Copyright 2016 Aviral Dasgupta and OpenMarket Ltd
Copyright 2016 Aviral Dasgupta
Copyright 2016 OpenMarket Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

View file

@ -1,7 +1,8 @@
// @flow
/*
Copyright 2016 Aviral Dasgupta and OpenMarket Ltd
Copyright 2016 Aviral Dasgupta
Copyright 2016 OpenMarket Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.