Merge d6998e9 into 077cf94

sonata-project · Dec 2, 2016 · d9efc68 · d9efc68
2 parents 077cf94 + d6998e9
commit d9efc68
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,9 @@
-.php_cs.cache
-
-# composer related
+/build
+/Resources/doc/_build
+/vendor
 composer.lock
-composer.phar
-vendor
+phpunit.xml
+.php_cs.cache
 
 # propel-generated stuff
 Tests/Fixtures/App/app/propel/sql/