Merge branch 'master' into 'release'

Master See merge request !12

Merge branch 'master' into 'release'
Master See merge request !12
9fd6319e · semenov · 7ed959be · 67623c0d · 9fd6319e · 9fd6319e
Commit 9fd6319e authored Jun 23, 2015 by semenov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

VERSION
+2 -2

config/main.php
+0 -1

No files found.
--- a/VERSION
+++ b/VERSION
-2.0.0.rc1
\ No newline at end of file
+2.0.0
\ No newline at end of file
--- a/config/main.php
+++ b/config/main.php
@@ -5,7 +5,6 @@
 * @copyright 2010 SkeekS (СкикС)
 * @date 15.06.2015
 */
-die;
 return [
    'components' =>
    [],