Skip to content

Commit

Permalink
Merge branch 'release/1.6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
fabfuel committed Sep 16, 2017
2 parents bd0746c + 9eba488 commit 3b8cbc5
Show file tree
Hide file tree
Showing 88 changed files with 239 additions and 9,481 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
vendor
build
tools
composer.lock
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Git normalization
#
build/ export-ignore
tools/ export-ignore
public/ export-ignore
.idea export-ignore
.gitattributes export-ignore
Expand Down
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
vendor
build
/vendor
/build
.sass-cache
.idea/commandlinetools
/.idea
/composer.lock
/composer.phar
14 changes: 0 additions & 14 deletions .idea/codeStyleSettings.xml

This file was deleted.

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/composerJson.xml

This file was deleted.

14 changes: 0 additions & 14 deletions .idea/dictionaries/fabfuel.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/encodings.xml

This file was deleted.

16 changes: 0 additions & 16 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/inspectionProfiles/profiles_settings.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/misc.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/modules.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/php.xml

This file was deleted.

152 changes: 0 additions & 152 deletions .idea/prophiler.iml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/runConfigurations/All_Tests.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/runConfigurations/All_Tests__build_.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/scopes/scope_settings.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/vagrant.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/vcs.xml

This file was deleted.

2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ tools:
external_code_coverage: true

filter:
excluded_paths: [build/*, tools/*, tests/*, public/*]
excluded_paths: [build/*, tests/*]
Loading

0 comments on commit 3b8cbc5

Please sign in to comment.