Merge branch '2.1.0' into 2.1

This commit is contained in:
Johan Wikman
2017-02-15 08:44:55 +02:00
346 changed files with 493 additions and 388 deletions

View File

@ -2,7 +2,7 @@
* Copyright (c) 2016 MariaDB Corporation Ab
*
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl.
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2019-07-01
*

View File

@ -2,7 +2,7 @@
* Copyright (c) 2016 MariaDB Corporation Ab
*
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl.
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2019-07-01
*