1
0
mirror of https://github.com/Hutchy68/pivot.git synced 2024-11-22 02:19:03 +01:00

Reset for develop branch, v2.3.1-dev

This commit is contained in:
Tom Hutchison 2020-12-11 11:27:50 -05:00
parent 9aa99bc243
commit 7eb9d559ba
2 changed files with 4 additions and 5 deletions

View File

@ -1,12 +1,11 @@
<<<<<<< HEAD ## Version 2.3.1-dev
=======
# Version 2.3.0 ## Version 2.3.0
* [compatibility, CSS] Load MW core CSS that was dropped in MW 1.35 * [compatibility, CSS] Load MW core CSS that was dropped in MW 1.35
* [code] Drop Travis-CI and move to CircleCI * [code] Drop Travis-CI and move to CircleCI
* [code] Update php-parallel-lint to a supported branch with PHP 8.0 * [code] Update php-parallel-lint to a supported branch with PHP 8.0
* [deprecated, code] Updated deprecated code * [deprecated, code] Updated deprecated code
>>>>>>> master
## Version 2.2.2 ## Version 2.2.2
* [bug, enhancement] Fix to allow multiple methods of login such as MW-OAuth2Client - Issue #99 * [bug, enhancement] Fix to allow multiple methods of login such as MW-OAuth2Client - Issue #99
* [bug, enhancement] Left-menu search (on mobile widths only) doesn't auto-complete #98 * [bug, enhancement] Left-menu search (on mobile widths only) doesn't auto-complete #98

View File

@ -1,6 +1,6 @@
{ {
"name": "Pivot", "name": "Pivot",
"version": "2.3.0", "version": "2.3.1-dev",
"author": [ "author": [
"Tom Hutchison", "Tom Hutchison",
"..." "..."