Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/composer/pepakriz/phpstan-excep…
Browse files Browse the repository at this point in the history
…tion-rules-tw-0.3or-tw-0.4
  • Loading branch information
asgrim authored Oct 18, 2019
2 parents 993fa88 + f85bb5d commit faf531c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Browser Capabilities PHP Project

This is a userland replacement for PHP's native `get_browser()` function, which is _officially supported_ by the Browser Capabilities Project.

**Note that you are currently viewing the 4.x series. If you're looking for any 2.x version, please read the documentation for that branch [here](https://github.com/browscap/browscap-php/tree/2.x).**
**Note that you are currently viewing the 4.x series. If you're looking for the unsupported 2.x version, please read the documentation for that branch [here](https://github.com/browscap/browscap-php/tree/2.x).**

[![Build Status](https://secure.travis-ci.org/browscap/browscap-php.png?branch=master)](http://travis-ci.org/browscap/browscap-php) [![codecov](https://codecov.io/gh/browscap/browscap-php/branch/master/graph/badge.svg)](https://codecov.io/gh/browscap/browscap-php)

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"php": ">=7.1.0,<7.4.0",
"daverandom/exceptional-json": "^1.0.4",
"guzzlehttp/guzzle": "^6.2",
"monolog/monolog": "^1.23",
"monolog/monolog": "^1.23 || ^2.0",
"psr/simple-cache": "^1.0",
"roave/doctrine-simplecache": "^1.1 || ^2.0",
"symfony/console": "^3.3 || ^4.0",
Expand Down

0 comments on commit faf531c

Please sign in to comment.