Merge branch 'release-v2.4.0'

contracts/GSN/README.adoc

@@ -15,8 +15,6 @@ Utilities to make writing xref:ROOT:gsn-strategies.adoc[GSN strategies] easy are
 
 You can also take a look at the two contract interfaces that make up the GSN protocol: {IRelayRecipient} and {IRelayHub}, but you won't need to use those directly.
 
-NOTE: This feature is being released in the next version of OpenZeppelin Contracts, available right now through `npm install @openzeppelin/contracts@next`.
-
 == Recipient
 
 {{GSNRecipient}}

contracts/math/SafeMath.sol

@@ -52,9 +52,6 @@ library SafeMath {
      * Requirements:
      * - Subtraction cannot overflow.
      *
-     * NOTE: This is a feature of the next version of OpenZeppelin Contracts.
-     * @dev Get it via `npm install @openzeppelin/contracts@next`.
-     *
      * _Available since v2.4.0._
      */
     function sub(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) {
@@ -112,9 +109,6 @@ library SafeMath {
      *
      * Requirements:
      * - The divisor cannot be zero.
-
-     * NOTE: This is a feature of the next version of OpenZeppelin Contracts.
-     * @dev Get it via `npm install @openzeppelin/contracts@next`.
      *
      * _Available since v2.4.0._
      */
@@ -153,9 +147,6 @@ library SafeMath {
      * Requirements:
      * - The divisor cannot be zero.
      *
-     * NOTE: This is a feature of the next version of OpenZeppelin Contracts.
-     * @dev Get it via `npm install @openzeppelin/contracts@next`.
-     *
      * _Available since v2.4.0._
      */
     function mod(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) {

contracts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/contracts",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Secure Smart Contract library for Solidity",
   "files": [
     "**/*.sol",

contracts/utils/Address.sol

@@ -34,9 +34,6 @@ library Address {
      * @dev Converts an `address` into `address payable`. Note that this is
      * simply a type cast: the actual underlying value is not changed.
      *
-     * NOTE: This is a feature of the next version of OpenZeppelin Contracts.
-     * @dev Get it via `npm install @openzeppelin/contracts@next`.
-     *
      * _Available since v2.4.0._
      */
     function toPayable(address account) internal pure returns (address payable) {