[phpMyAdmin Git] [phpmyadmin/phpmyadmin] fa98b0: Prepare for 5.1.0

[Isaac Bennetch]

Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: fa98b0b09dd2c933e4aad14c69ee99bba54a5013
https://github.com/phpmyadmin/phpmyadmin/commit/fa98b0b09dd2c933e4aad14c69ee99bba54a5013
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2021-02-24 (Wed, 02 February 2021) -05:00

Changed paths: 
M ChangeLog
M README
M doc/conf.py
M libraries/classes/Version.php
M package.json

Log Message:
-----------
Prepare for 5.1.0

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: 333edd4a793e95a04ee97951ee48807350dca728
https://github.com/phpmyadmin/phpmyadmin/commit/333edd4a793e95a04ee97951ee48807350dca728
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2021-02-24 (Wed, 02 February 2021) -05:00

Changed paths: 
A composer.lock

Log Message:
-----------
Adding composer lock for 5.1.0

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: abe80af20a618361f581958968b49b6ca360eb9e
https://github.com/phpmyadmin/phpmyadmin/commit/abe80af20a618361f581958968b49b6ca360eb9e
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2021-02-24 (Wed, 02 February 2021) -05:00

Changed paths: 
M po/zh_CN.po
M psalm-baseline.xml

Log Message:
-----------
Merge remote-tracking branch 'origin/QA_5_1' into QA_5_1

Commit: 610fb1dbd4eaa8e857664dd28c2d1ab6e19810a6
https://github.com/phpmyadmin/phpmyadmin/commit/610fb1dbd4eaa8e857664dd28c2d1ab6e19810a6
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2021-02-24 (Wed, 02 February 2021) -05:00

Changed paths: 
M README
M doc/conf.py
M libraries/classes/Version.php
M package.json

Log Message:
-----------
Prepare for 5.1.1-dev

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: 944d467e0e53bf09a2b9b25fc0a4679fcb95e91b
https://github.com/phpmyadmin/phpmyadmin/commit/944d467e0e53bf09a2b9b25fc0a4679fcb95e91b
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2021-02-24 (Wed, 02 February 2021) -05:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Prepare ChangeLog for 5.1.1-dev

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: 5e9bd1cb1c768fbcf183a5295a3ae528348c8273
https://github.com/phpmyadmin/phpmyadmin/commit/5e9bd1cb1c768fbcf183a5295a3ae528348c8273
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2021-02-24 (Wed, 02 February 2021) -05:00

Changed paths: 
D composer.lock

Log Message:
-----------
Removing composer.lock

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: e694793507928ab3a0f63bd05b033c59575a11fc
https://github.com/phpmyadmin/phpmyadmin/commit/e694793507928ab3a0f63bd05b033c59575a11fc
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2021-02-24 (Wed, 02 February 2021) -05:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Fix merge conflicts

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>