Merge pull request #1622 from sjinks/1.2.5

[1.2.5] Fix #1480
phalcon · Dec 2, 2013 · 5544ba6 · 5544ba6
2 parents 12c2b50 + b585227
commit 5544ba6
Show file tree

Hide file tree

Showing 10 changed files with 1,338 additions and 2,171 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -11,6 +11,7 @@
  - Added Phalcon\Mvc\Model\Row::toArray() method (#1506)
  - Added support for POINT type in MySQL (#1536)
  - Phalcon\Mvc\Model\Validator::getOption() returns NULL if the option does not exist (#1530)
+ - Fixed parsing of annotations containing / (#1480)
 
 1.2.4
  - Fixed broken ACL inheritance (#905)