diff options
| author | Nils Adermann <naderman@naderman.de> | 2015-05-30 10:58:40 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2015-05-30 10:58:40 +0200 |
| commit | f958d05aedddae9704b01ff5fc06112e57ff3efd (patch) | |
| tree | 4c38f030c846df579ef5a00236e01157b537653e /phpBB/phpbb/notification/method/base.php | |
| parent | 3f4206e012e048d5c3c756a66296ca26300314cd (diff) | |
| parent | 01073ffcbf6ecff50071018e2eaaae9cd81fcbbc (diff) | |
| download | forums-f958d05aedddae9704b01ff5fc06112e57ff3efd.tar forums-f958d05aedddae9704b01ff5fc06112e57ff3efd.tar.gz forums-f958d05aedddae9704b01ff5fc06112e57ff3efd.tar.bz2 forums-f958d05aedddae9704b01ff5fc06112e57ff3efd.tar.xz forums-f958d05aedddae9704b01ff5fc06112e57ff3efd.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13790] Update phpcs
Conflicts:
phpBB/composer.json
phpBB/composer.lock
Diffstat (limited to 'phpBB/phpbb/notification/method/base.php')
| -rw-r--r-- | phpBB/phpbb/notification/method/base.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/notification/method/base.php b/phpBB/phpbb/notification/method/base.php index a0bbed6fcd..6ee1d2984a 100644 --- a/phpBB/phpbb/notification/method/base.php +++ b/phpBB/phpbb/notification/method/base.php @@ -60,7 +60,7 @@ abstract class base implements \phpbb\notification\method\method_interface /** * Notification Method Base Constructor - * + * * @param \phpbb\user_loader $user_loader * @param \phpbb\db\driver\driver_interface $db * @param \phpbb\cache\driver\driver_interface $cache @@ -85,7 +85,7 @@ abstract class base implements \phpbb\notification\method\method_interface /** * Set notification manager (required) - * + * * @param \phpbb\notification\manager $notification_manager */ public function set_notification_manager(\phpbb\notification\manager $notification_manager) |