Merge commit '5e0f5f1e1c7a0c57dd453920519444440a63ac57' into nginx

Genovo · Sep 22, 2013 · 2a5443a · 2a5443a
2 parents 2cc7c92 + 5e0f5f1
commit 2a5443a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/users/app/.gitignore b/users/app/.gitignore
@@ -9,5 +9,4 @@
 !/.gitconfig
 /git
 /sauce.json
-/tmp
 *~
diff --git a/users/app/tmp/.gitignore b/users/app/tmp/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,5 +9,4 @@ @@
     !/.gitconfig
     /git
     /sauce.json
-    /tmp
     *~