Merge remote-tracking branch 'origin/master' into pr/506
Conflicts: Yii.gitignore
This commit is contained in:
@@ -3,4 +3,4 @@ assets/*
|
||||
protected/runtime/*
|
||||
!protected/runtime/.gitignore
|
||||
protected/data/*.db
|
||||
themes/classic/views/
|
||||
themes/classic/views/
|
||||
|
Reference in New Issue
Block a user