Merge pull request #2609 from josharian/master

shiftkey · web-flow · commit 1be61803a156 · 2018-03-11T14:59:10.000-07:00
Joomla: don't ignore .gitignore
diff --git a/Joomla.gitignore b/Joomla.gitignore
@@ -1,4 +1,3 @@
-/.gitignore
 /.htaccess
 /administrator/cache/*
 /administrator/components/com_admin/*

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/.gitignore`
`2`	`1`	`/.htaccess`
`3`	`2`	`/administrator/cache/*`
`4`	`3`	`/administrator/components/com_admin/*`