Skip to content

Commit 43c3d90

Browse files
pamilpamil
committed
Merge branch '1.1' into 1.2
* 1.1: Keep predefined directories in "web" in test application
2 parents d1288d2 + ed15aaa commit 43c3d90

File tree

4 files changed

+3
-0
lines changed

4 files changed

+3
-0
lines changed

‎tests/Application/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
!/var/.gitkeep
55

66
/web/*
7+
!/web/assets/.gitkeep
8+
!/web/bundles/.gitkeep
9+
!/web/media/image/.gitkeep
710
!/web/app.php
811
!/web/app_dev.php
912
!/web/app_test.php

‎tests/Application/web/assets/.gitkeep

Whitespace-only changes.

‎tests/Application/web/bundles/.gitkeep

Whitespace-only changes.

‎tests/Application/web/media/image/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)