Merge branch 'release/1.6.0'

fabfuel · Sep 16, 2017 · 3b8cbc5 · 3b8cbc5
2 parents bd0746c + 9eba488
commit 3b8cbc5
Show file tree

Hide file tree

Showing 88 changed files with 239 additions and 9,481 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -2,3 +2,4 @@
 vendor
 build
 tools
+composer.lock
diff --git a/.gitattributes b/.gitattributes
@@ -2,7 +2,6 @@
 # Git normalization
 #
 build/              export-ignore
-tools/              export-ignore
 public/             export-ignore
 .idea               export-ignore
 .gitattributes      export-ignore

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
-vendor
-build
+/vendor
+/build
 .sass-cache
-.idea/commandlinetools
+/.idea
+/composer.lock
+/composer.phar
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/commandlinetools/schemas/frameworkDescriptionVersion1.1.3.xsd b/.idea/commandlinetools/schemas/frameworkDescriptionVersion1.1.3.xsd
diff --git a/.idea/composerJson.xml b/.idea/composerJson.xml
diff --git a/.idea/dictionaries/fabfuel.xml b/.idea/dictionaries/fabfuel.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/prophiler.iml b/.idea/prophiler.iml
diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml
diff --git a/.idea/runConfigurations/All_Tests__build_.xml b/.idea/runConfigurations/All_Tests__build_.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vagrant.xml b/.idea/vagrant.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -5,4 +5,4 @@ tools:
     external_code_coverage: true
 
 filter:
-    excluded_paths: [build/*, tools/*, tests/*, public/*]
+    excluded_paths: [build/*, tests/*]