diff options
author | Nils Adermann <naderman@naderman.de> | 2014-10-25 16:56:05 -0700 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2014-10-25 16:56:05 -0700 |
commit | 26d4483d36ec82f6dc8f4943f289be94302ab7ce (patch) | |
tree | 3a14ab74c35a76081d53361b143c454f21b7473e /phpBB/phpbb/class_loader.php | |
parent | f22cd2d7348dc3a103e53aa773b6f91abe998ddd (diff) | |
parent | 4859cec0c50cc522e73dba5555def308835b1357 (diff) | |
download | forums-26d4483d36ec82f6dc8f4943f289be94302ab7ce.tar forums-26d4483d36ec82f6dc8f4943f289be94302ab7ce.tar.gz forums-26d4483d36ec82f6dc8f4943f289be94302ab7ce.tar.bz2 forums-26d4483d36ec82f6dc8f4943f289be94302ab7ce.tar.xz forums-26d4483d36ec82f6dc8f4943f289be94302ab7ce.zip |
Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
[ticket/13207] Add notification manager mock to user_add method in tests
[ticket/13207] Move default user notifications settings to user_add()
[ticket/13207] Add default subscription options for newly registered users
Diffstat (limited to 'phpBB/phpbb/class_loader.php')
0 files changed, 0 insertions, 0 deletions