Merge remote-tracking branch 'origin/develop'

elboletaire · Apr 28, 2016 · 3c6336b · 3c6336b
2 parents 5cd30a4 + 275618c
commit 3c6336b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,10 @@
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_size = 4
+indent_style = space
+
+[*.{js,yml}]
+indent_size = 2
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 composer.lock
-vendor/*
-tests/test_files/webroot/css/*
+vendor/
+tests/test_files/webroot/css/
diff --git a/readme.md b/readme.md
@@ -4,7 +4,7 @@ Less parser plugin for CakePHP 3.X
 [![Build status](https://img.shields.io/travis/elboletaire/less-cake-plugin.svg?style=flat-square)](https://travis-ci.org/elboletaire/less-cake-plugin)
 [![Code coverage](https://img.shields.io/coveralls/elboletaire/less-cake-plugin.svg?style=flat-square)](https://coveralls.io/github/elboletaire/less-cake-plugin)
 [![License](https://img.shields.io/packagist/l/elboletaire/less-cake-plugin.svg?style=flat-square)](https://github.com/elboletaire/less-cake-plugin/blob/master/LICENSE)
-[![Latest Stable Version](https://img.shields.io/packagist/v/elboletaire/less-cake-plugin.svg?style=flat-square)](https://github.com/elboletaire/less-cake-plugin/releases)
+[![Latest Stable Version](https://img.shields.io/github/release/elboletaire/less-cake-plugin.svg?style=flat-square)](https://github.com/elboletaire/less-cake-plugin/releases)
 [![Total Downloads](https://img.shields.io/packagist/dt/elboletaire/less-cake-plugin.svg?style=flat-square)](https://packagist.org/packages/elboletaire/less-cake-plugin)
 [![Code Climate](https://img.shields.io/codeclimate/github/elboletaire/less-cake-plugin.svg?style=flat-square)](https://codeclimate.com/github/elboletaire/less-cake-plugin)