mirror of
https://github.com/phpbb/phpbb.git
synced 2025-04-21 00:02:18 +02:00
Merge branch '3.2.x' into 3.3.x
This commit is contained in:
commit
a88a68f8a6
2
.gitignore
vendored
2
.gitignore
vendored
@ -20,6 +20,7 @@
|
||||
!/phpBB/styles/prosilver/theme/en
|
||||
!/phpBB/styles/prosilver/theme/images
|
||||
!/phpBB/styles/all
|
||||
node_modules
|
||||
/phpBB/vendor
|
||||
/tests/phpbb_unit_tests.sqlite*
|
||||
/tests/test_config*.php
|
||||
@ -27,4 +28,5 @@
|
||||
/tests/vendor
|
||||
/vagrant/phpbb-install-config.yml
|
||||
.vagrant
|
||||
.idea
|
||||
*.DS_Store*
|
||||
|
Loading…
x
Reference in New Issue
Block a user