]> source.dussan.org Git - gitignore.git/commit
Merge branch 'fix-846'
authorCarl Suster <code@contraflo.ws>
Fri, 21 Mar 2014 01:57:57 +0000 (12:57 +1100)
committerCarl Suster <code@contraflo.ws>
Fri, 21 Mar 2014 01:57:57 +0000 (12:57 +1100)
commit250a511357e991f269cc545326524ed4a1a9bb3f
treed9414ba96c782d40192997891684a373458ec234
parent655e5ba74d5a6d9b712713c7640d97f879f4a7dc
parentaf6b1895ddb7fbf84bee8d66fe4a46553bf3d4ab
Merge branch 'fix-846'

Support for Phalcon, a PHP Framework

Manually fixed up the rules in the original PR to be consistent with our
omission of the trailing asterisk elsewhere. Fixes #846.