aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/diff
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-10-23 14:10:19 +0200
committerNils Adermann <naderman@naderman.de>2010-10-23 14:10:19 +0200
commitecd648c9967f360ea21d3f1a479704af803499fe (patch)
tree70ec71e1734728aead0e7ec4cfa262f201a268ff /phpBB/includes/diff
parent6bba2794342553a81c2427d6db3e3dfc715c9550 (diff)
parente87a8ef02c029a7c622b5ab8bb60e67c012a6165 (diff)
downloadforums-ecd648c9967f360ea21d3f1a479704af803499fe.tar
forums-ecd648c9967f360ea21d3f1a479704af803499fe.tar.gz
forums-ecd648c9967f360ea21d3f1a479704af803499fe.tar.bz2
forums-ecd648c9967f360ea21d3f1a479704af803499fe.tar.xz
forums-ecd648c9967f360ea21d3f1a479704af803499fe.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9807] Update existing module permissions in database [ticket/9807] Hide avatar tab in UCP when avatars are disabled
Diffstat (limited to 'phpBB/includes/diff')
0 files changed, 0 insertions, 0 deletions