From: Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>
Date: Mon, 11 Nov 2013 17:51:38 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/master' into pr/506
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1a1de190aed798e1c8179e2706ab733eda64bd71;p=gitignore.git

Merge remote-tracking branch 'origin/master' into pr/506

Conflicts:
	Yii.gitignore
---

1a1de190aed798e1c8179e2706ab733eda64bd71
diff --cc Yii.gitignore
index 834eb17c,33a5154d..70f08754
--- a/Yii.gitignore
+++ b/Yii.gitignore
@@@ -1,6 -1,3 +1,6 @@@
 -assets/
 -protected/runtime/
 +assets/*
 +!assets/.gitignore
 +protected/runtime/*
 +!protected/runtime/.gitignore
 +protected/data/*.db
- themes/classic/views/
+ themes/classic/views/