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

This commit is contained in:
David Baker 2016-11-03 11:51:06 +00:00
commit 8cafe4936d

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.