Changed dev version to 3.0.2 [ci skip]

1ukaz · Aug 24, 2016 · 2f2a453 · 2f2a453
1 parent 02acfec
commit 2f2a453
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,5 +3,7 @@ docs/* linguist-documentation
 *.zep.h linguist-language=C
 *.zep.c linguist-language=C
 
+*.sql linguist-language=SQL
+
 ext/* linguist-vendored
 build/* linguist-vendored
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,7 +8,7 @@ Please also check the following points are being met:
 
 - [ ] Make sure that the PR passes in Travis CI to make the process more efficient.
 - [ ] Only use tabs for indentation.
-- [ ] if needed, rebase to the proper branch before submitting your pull request.
+- [ ] If needed, rebase to the proper branch before submitting your pull request.
       If it doesn't merge cleanly with master you may be asked to rebase your changes.
 - [ ] Don't put submodule updates in your pull request unless they are to landed commits.
 - [ ] Add tests relevant to the fixed bug or new feature. See our testing guide for

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+# [3.0.2](https://github.com/phalcon/cphalcon/releases/tag/v3.0.2) (2016-XX-XX)
+
 # [3.0.1](https://github.com/phalcon/cphalcon/releases/tag/v3.0.1) (2016-08-24)
 - Fixed `Phalcon\Cache\Backend\Redis::flush` in order to flush cache correctly
 - Fixed `Phalcon\Mvc\Model\Manager::getRelationRecords` to correct using multi relation column [#12035](https://github.com/phalcon/cphalcon/issues/12035)

diff --git a/config.json b/config.json
@@ -10,7 +10,7 @@
     "name": "phalcon",
     "description": "Web framework delivered as a C-extension for PHP",
     "author": "Phalcon Team and contributors",
-    "version": "3.0.1",
+    "version": "3.0.2",
     "verbose": false,
     "optimizer-dirs": [
         "optimizers"

diff --git a/phalcon/version.zep b/phalcon/version.zep
@@ -80,7 +80,7 @@ class Version
 	 */
 	protected static function _getVersion() -> array
 	{
-		return [3, 0, 1, 4, 0];
+		return [3, 0, 2, 4, 0];
 	}
 
 	/**
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,7 +80,7 @@ class Version @@
     	 */
     	protected static function _getVersion() -> array
     	{
-    		return [3, 0, 1, 4, 0];
+    		return [3, 0, 2, 4, 0];
     	}
     	/**
@@ Expand Down @@