many/gitignore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	Yii.gitignore
This commit is contained in:
Justin Spahr-Summers 2013-11-11 09:51:38 -08:00
commit 1a1de190ae
76 changed files with 520 additions and 413 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Yii.gitignore
View file

@ -3,4 +3,4 @@ assets/*
protected/runtime/*
!protected/runtime/.gitignore
protected/data/*.db
themes/classic/views/
themes/classic/views/