makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse source
This commit is contained in:
Marc Alexander 2020-05-03 11:06:08 +02:00
commit a88a68f8a6
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -20,6 +20,7 @@
!/phpBB/styles/prosilver/theme/en !/phpBB/styles/prosilver/theme/en
!/phpBB/styles/prosilver/theme/images !/phpBB/styles/prosilver/theme/images
!/phpBB/styles/all !/phpBB/styles/all
node_modules
/phpBB/vendor /phpBB/vendor
/tests/phpbb_unit_tests.sqlite* /tests/phpbb_unit_tests.sqlite*
/tests/test_config*.php /tests/test_config*.php
@ -27,4 +28,5 @@
/tests/vendor /tests/vendor
/vagrant/phpbb-install-config.yml /vagrant/phpbb-install-config.yml
.vagrant .vagrant
.idea
*.DS_Store* *.DS_Store*