Merge branch '2.1' into 2.2

orchestral · Aug 22, 2014 · de5805d · de5805d
2 parents e2d07a1 + 1124eea
commit de5805d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,3 @@
 # Composer
 composer.lock
 vendor/*
-
-# Fixtures
-src/fixture/app/storage/meta/*
diff --git a/src/fixture/storage/meta/.gitignore b/src/fixture/storage/meta/.gitignore
@@ -0,0 +1 @@
+/services.json