diff --git a/app/Constants.php b/app/Constants.php index 6cd1e0243e6a..bc706d549d0d 100644 --- a/app/Constants.php +++ b/app/Constants.php @@ -339,7 +339,7 @@ if (! defined('APP_NAME')) { define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com')); define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'http://docs.invoiceninja.com/en/latest')); define('NINJA_DATE', '2000-01-01'); - define('NINJA_VERSION', '4.3.0' . env('NINJA_VERSION_SUFFIX')); + define('NINJA_VERSION', '4.3.1' . env('NINJA_VERSION_SUFFIX')); define('NINJA_TERMS_VERSION', ''); define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja')); diff --git a/composer.json b/composer.json index d448888ad9a1..fb677eb3daec 100644 --- a/composer.json +++ b/composer.json @@ -51,6 +51,7 @@ "league/fractal": "0.13.*", "maatwebsite/excel": "~2.0", "mpdf/mpdf": "6.1.3", + "nesbot/carbon": "^1.25", "nwidart/laravel-modules": "1.*", "omnipay/authorizenet": "dev-solution-id as 2.5.0", "patricktalmadge/bootstrapper": "5.5.x", diff --git a/composer.lock b/composer.lock index 0fe0eefcf6d3..7b3edde8a5d6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "7090bedcce23dd1dcc592a0d3e544763", - "content-hash": "4ce866c804fd7e1b830c8ae1afa28846", + "hash": "81ec40f578917feb6070a8c9911bf69c", + "content-hash": "ad55e995b8e9255f3319e3b3ae1200e5", "packages": [ { "name": "abdala/omnipay-pagseguro", @@ -5438,16 +5438,16 @@ }, { "name": "nesbot/carbon", - "version": "1.24.1", + "version": "1.25.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "ef12cbd8ba5ce624f0a6a95e0850c4cc13e71e41" + "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ef12cbd8ba5ce624f0a6a95e0850c4cc13e71e41", - "reference": "ef12cbd8ba5ce624f0a6a95e0850c4cc13e71e41", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cbcf13da0b531767e39eb86e9687f5deba9857b4", + "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4", "shasum": "" }, "require": { @@ -5487,7 +5487,7 @@ "datetime", "time" ], - "time": "2018-03-09 15:49:34" + "time": "2018-03-19 15:50:49" }, { "name": "nikic/php-parser", diff --git a/docs/conf.py b/docs/conf.py index 78a65ebd2a2b..1f013d7f6e46 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -59,7 +59,7 @@ author = u'Invoice Ninja' # The short X.Y version. version = u'4.3' # The full version, including alpha/beta/rc tags. -release = u'4.3.0' +release = u'4.3.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.