Merges changes from 1.3.X into master

phptal / PHPTAL

PHP Template Attribute Language — template engine for XSS-proof well-formed XHTML and HTML5 pages

http://phptal.org

GNU Lesser General Public License v2.1

175 stars 43 forks source link

Closed Potherca closed 8 years ago

Potherca commented 8 years ago

Fixes Travis build by making sure the locales used in the tests are installed on the Travis environment.

Ocramius commented 8 years ago

Looks good, but needs a rebase

Potherca commented 8 years ago

I got the feeling I was missing something :disappointed:. Will rebase & try again.

Potherca commented 8 years ago

There was a conflict on .travis.yml between branches 1.3.x and master. This is as clean as I can get it (at this hour :computer: :sleeping:).

Ocramius commented 8 years ago

@Potherca can you assign an appropriate milestone to this PR? As far as I know, 2.0.0 is released