aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-07-24 22:14:52 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-07-24 22:14:52 +0200
commit593ab9362ecf5270a8a0b97cb928633a5836336b (patch)
tree82c49485a2de90af3842c88b251edc59d893ec45 /phpBB/adm
parentf0516b7d2a0ac0e1fbf6832cfcfde119ad508907 (diff)
parent13fa346e8f5b496f5e51ea20e9420a48228a5072 (diff)
downloadforums-593ab9362ecf5270a8a0b97cb928633a5836336b.tar
forums-593ab9362ecf5270a8a0b97cb928633a5836336b.tar.gz
forums-593ab9362ecf5270a8a0b97cb928633a5836336b.tar.bz2
forums-593ab9362ecf5270a8a0b97cb928633a5836336b.tar.xz
forums-593ab9362ecf5270a8a0b97cb928633a5836336b.zip
Merge remote-tracking branch 'brunoais/ticket/11656' into develop
* brunoais/ticket/11656: [ticket/11656] Made the check for the bitfield just like other PR's [ticket/11656] Wrong bitwise OR [ticket/11656] Remove line break in function call [ticket/11656] generate_text_for_display on memberlist.php
Diffstat (limited to 'phpBB/adm')
0 files changed, 0 insertions, 0 deletions