diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-08-21 14:11:10 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-08-21 14:11:10 +0200 |
| commit | 9f9e4ad3d8d9b88be01427739088020d9e64164b (patch) | |
| tree | a83c1ab93b9e7847d1c40af60f93f0877e7ced83 | |
| parent | 15d0fe7d9feae915a0ec6a8e63e8ac955bedae60 (diff) | |
| parent | 57accade85a431725af7745230ac26b000ff831a (diff) | |
| download | forums-9f9e4ad3d8d9b88be01427739088020d9e64164b.tar forums-9f9e4ad3d8d9b88be01427739088020d9e64164b.tar.gz forums-9f9e4ad3d8d9b88be01427739088020d9e64164b.tar.bz2 forums-9f9e4ad3d8d9b88be01427739088020d9e64164b.tar.xz forums-9f9e4ad3d8d9b88be01427739088020d9e64164b.zip | |
Merge remote-tracking branch 'p/ticket/10309' into develop-olympus
* p/ticket/10309:
[ticket/10309] Update .gitignore and move .gitkeep.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | tests/tmp/.gitkeep (renamed from tests/utf/data/.gitkeep) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 65058b2eaf..7d789c59a1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ /phpBB/store/* /tests/phpbb_unit_tests.sqlite2 /tests/test_config.php -/tests/utf/data/*.txt +/tests/tmp/* diff --git a/tests/utf/data/.gitkeep b/tests/tmp/.gitkeep index e69de29bb2..e69de29bb2 100644 --- a/tests/utf/data/.gitkeep +++ b/tests/tmp/.gitkeep |