Merge branch 'develop' into experimental

This commit is contained in:
Bruno Windels 2018-10-31 14:54:22 +01:00
commit ba83166661
80 changed files with 760 additions and 263 deletions

View file

@ -1,6 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2107 Vector Creations Ltd
Copyright 2017 Vector Creations Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.