Merge branch 'develop'

# Conflicts: # config/version.php
cotlod · Mar 23, 2018 · 846613c · 846613c
2 parents 130bb19 + c4c137d
commit 846613c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/config/version.php b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v4.1.15',
-  'full_app_version' => 'v4.1.15 - build 3479-gbf74bb1',
+  'app_version' => 'v4.2.0',
+  'full_app_version' => 'v4.2.0 - build 3479-gbf74bb1',
   'build_version' => '3479',
   'prerelease_version' => '',
   'hash_version' => 'gbf74bb1',
-  'full_hash' => 'v4.1.15-3479-gbf74bb1',
+  'full_hash' => 'v4.2.0-3479-gbf74bb1',
   'branch' => 'master',
 );