Merge origin/dev

artur-stepien · Feb 26, 2018 · c12d2b6 · c12d2b6
2 parents 1f28596 + 4b370ba
commit c12d2b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/api.php b/api.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Wargaming.API
- * @version     1.3.2
+ * @version     1.3.3
  * @author      Artur Stępień ([email protected])
  * @copyright   Copyright (C) 2015 Artur Stępień, All rights reserved.
  * @license     GNU General Public License version 3 or later; see LICENSE.txt

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "dev"
+            "dev-master": "master-dev"
         }
     },
     "scripts": {},