Skip to content

Commit

Permalink
Merge branch 'lucasmichot-patch-1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mathiasgrimm
mathiasgrimm committed Feb 18, 2016
2 parents 40e51bd + 461bc9b commit 5d511de
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
.settings
.buildpath
composer.phar
Thumbs.db
Thumbs.db
composer.lock

0 comments on commit 5d511de

Please sign in to comment.