From 34f93ffcbc5a6ff6918fb48d5c4d448658b50c4b Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@calat.com>
Date: Tue, 3 Dec 2013 14:47:58 +0100
Subject: [PATCH 1/6] Created Zend Framework 2 gitignore file

---
 ZendFramework2.gitignore | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 ZendFramework2.gitignore

diff --git a/ZendFramework2.gitignore b/ZendFramework2.gitignore
new file mode 100644
index 00000000..645d9318
--- /dev/null
+++ b/ZendFramework2.gitignore
@@ -0,0 +1,22 @@
+# License and readme
+INSTALL*
+LICENSE*
+README*
+
+# Composer files
+composer.lock
+composer.phar
+vendor/
+
+# Local configs
+config/autoload/*local.php
+
+# Binary gettext files
+*.po
+
+# Data
+log/
+logs/
+cache/
+temp/
+tmp/
\ No newline at end of file

From c2351631b7671f375542ce4f43bb9142b17d6d8b Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@calat.com>
Date: Tue, 3 Dec 2013 14:51:50 +0100
Subject: [PATCH 2/6] Included missing new line

---
 ZendFramework2.gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ZendFramework2.gitignore b/ZendFramework2.gitignore
index 645d9318..526a85cc 100644
--- a/ZendFramework2.gitignore
+++ b/ZendFramework2.gitignore
@@ -19,4 +19,4 @@ log/
 logs/
 cache/
 temp/
-tmp/
\ No newline at end of file
+tmp/

From b8a520853b7c5f9f1d5290085efd4f9d1e04fdb8 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Fri, 25 Apr 2014 08:13:24 +0200
Subject: [PATCH 3/6] Composer.lock and READMEs are no longer ignored

---
 ZendFramework2.gitignore | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ZendFramework2.gitignore b/ZendFramework2.gitignore
index 526a85cc..6c7b29c7 100644
--- a/ZendFramework2.gitignore
+++ b/ZendFramework2.gitignore
@@ -1,10 +1,4 @@
-# License and readme
-INSTALL*
-LICENSE*
-README*
-
 # Composer files
-composer.lock
 composer.phar
 vendor/
 

From d44417883f2bc9c93a643744c8bda32439683617 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Sun, 11 May 2014 12:59:57 +0200
Subject: [PATCH 4/6] Removed old ZendFramework.gitignore

Documentation rules have been removed and the rest of the rules are going to be included in the ZendFramework2.gitignore.
---
 ZendFramework.gitignore | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 ZendFramework.gitignore

diff --git a/ZendFramework.gitignore b/ZendFramework.gitignore
deleted file mode 100644
index 014f93f6..00000000
--- a/ZendFramework.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-INSTALL.txt
-LICENSE.txt
-README.txt
-demos/
-extras/documentation

From 1d96081fc9dd50b5e8bac0cb6865b5152ed51cbc Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Sun, 11 May 2014 13:00:31 +0200
Subject: [PATCH 5/6] Included Zend Framework 1 rules

---
 ZendFramework2.gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ZendFramework2.gitignore b/ZendFramework2.gitignore
index 6c7b29c7..cd248f53 100644
--- a/ZendFramework2.gitignore
+++ b/ZendFramework2.gitignore
@@ -14,3 +14,7 @@ logs/
 cache/
 temp/
 tmp/
+
+# ZF1
+demos/
+extras/documentation

From ee1c7c01c1ee729afc281367d05c56f8ed577f64 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Sun, 11 May 2014 13:01:13 +0200
Subject: [PATCH 6/6] ZendFramework2.gitignore renamed to
 ZendFramework.gitignore

---
 ZendFramework2.gitignore => ZendFramework.gitignore | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename ZendFramework2.gitignore => ZendFramework.gitignore (100%)

diff --git a/ZendFramework2.gitignore b/ZendFramework.gitignore
similarity index 100%
rename from ZendFramework2.gitignore
rename to ZendFramework.gitignore