Skip to content

Commit

Permalink
Merge branch '3.0' into 3.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/Table/Grid.php

Signed-off-by: crynobone <[email protected]>
  • Loading branch information
crynobone committed Sep 14, 2015
2 parents c1eab97 + b0948bf commit 9d66ff1
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 12 deletions.
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.yml]
indent_style = space
indent_size = 2
25 changes: 13 additions & 12 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
* text=auto

# Ignore following folder/file.
/build export-ignore
/docs export-ignore
/tests export-ignore
/.coveralls.yml export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.php_cs export-ignore
/.scrutinizer.yml export-ignore
/.travis.yml export-ignore
/phpunit.xml export-ignore
/LICENSE export-ignore
/README.md export-ignore
/build export-ignore
/docs export-ignore
/tests export-ignore
/.coveralls.yml export-ignore
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.php_cs export-ignore
/.scrutinizer.yml export-ignore
/.travis.yml export-ignore
/phpunit.xml export-ignore
/LICENSE export-ignore
/README.md export-ignore
4 changes: 4 additions & 0 deletions docs/changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ title: HTML Change Log

## Version 3.0 {#v3-0}

### v3.0.2 {#v3-0-2}

* Add `Orchestra\Html\HtmlBuilder::attributable()` method.

### v3.0.1 {#v3-0-1}

* Add `Form::number()` and `Form::date()` helpers.
Expand Down

0 comments on commit 9d66ff1

Please sign in to comment.