aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/images
diff options
context:
space:
mode:
authorMaat <maat-pub@mageia.biz>2020-05-09 01:15:08 +0200
committerMaat <maat-pub@mageia.biz>2020-05-09 01:15:08 +0200
commit6985226b17e8a0ef0a720bf1d12fe0c216e13dab (patch)
tree116d2565ac02c40abe0548863c6badf8ec3e1d1e /phpBB/images
parent8ea437e30605e0f66b5220bf904a61d7c1d11ddd (diff)
parent8d00784dfe2c8bcb10843ff70b4cfa998d703285 (diff)
downloadforums-6985226b17e8a0ef0a720bf1d12fe0c216e13dab.tar
forums-6985226b17e8a0ef0a720bf1d12fe0c216e13dab.tar.gz
forums-6985226b17e8a0ef0a720bf1d12fe0c216e13dab.tar.bz2
forums-6985226b17e8a0ef0a720bf1d12fe0c216e13dab.tar.xz
forums-6985226b17e8a0ef0a720bf1d12fe0c216e13dab.zip
Merge remote-tracking branch 'upstream/prep-release-3.3.0'HEADmaster
Diffstat (limited to 'phpBB/images')
-rwxr-xr-x[-rw-r--r--]phpBB/images/avatars/upload/.htaccess0
-rwxr-xr-x[-rw-r--r--]phpBB/images/avatars/upload/index.htm0
-rw-r--r--phpBB/images/upload_icons/flash.gifbin254 -> 0 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/phpBB/images/avatars/upload/.htaccess b/phpBB/images/avatars/upload/.htaccess
index aa5afc1640..aa5afc1640 100644..100755
--- a/phpBB/images/avatars/upload/.htaccess
+++ b/phpBB/images/avatars/upload/.htaccess
diff --git a/phpBB/images/avatars/upload/index.htm b/phpBB/images/avatars/upload/index.htm
index ee1f723a7d..ee1f723a7d 100644..100755
--- a/phpBB/images/avatars/upload/index.htm
+++ b/phpBB/images/avatars/upload/index.htm
diff --git a/phpBB/images/upload_icons/flash.gif b/phpBB/images/upload_icons/flash.gif
deleted file mode 100644
index 00ee0f4f72..0000000000
--- a/phpBB/images/upload_icons/flash.gif
+++ /dev/null
Binary files differ