Dylan K. Taylor fb58959d5f Merge commit '189f12a644aa6474bc91650cce0eb0ae9735db91' ...

# Conflicts:
#	resources/vanilla

2020-05-18 10:34:00 +01:00

..

BanEntry.php

Merge branch 'stable'

2020-02-07 18:13:55 +00:00

BanList.php

pass 2, manual removal of incorrect non-nullable phpdoc types

2020-01-22 12:06:47 +00:00

DefaultPermissions.php

pass 2, manual removal of incorrect non-nullable phpdoc types

2020-01-22 12:06:47 +00:00

Permissible.php

pass 2, manual removal of incorrect non-nullable phpdoc types

2020-01-22 12:06:47 +00:00

PermissibleBase.php

Merge branch 'stable'

2020-02-07 18:13:55 +00:00

PermissibleDelegateTrait.php

Merge branch 'stable'

2020-02-07 18:13:55 +00:00

Permission.php

Merge commit '260ac47588c76a2e6814cfba46773a990fb8c5da'

2020-01-31 21:07:34 +00:00

PermissionAttachment.php

Merge branch 'stable'

2020-02-07 18:13:55 +00:00

PermissionAttachmentInfo.php

strip extra blank lines (php-cs-fixer)

2020-01-22 15:14:10 +00:00

PermissionManager.php

Merge commit '189f12a644aa6474bc91650cce0eb0ae9735db91'

2020-05-18 10:34:00 +01:00

PermissionParser.php

PermissionParser: move default string mappings to const array instead of switch

2020-05-16 11:26:00 +01:00

PermissionRemovedExecutor.php

strip extra blank lines (php-cs-fixer)

2020-01-22 15:14:10 +00:00

ServerOperator.php

strip extra blank lines (php-cs-fixer)

2020-01-22 15:14:10 +00:00