mirror of
https://github.com/silverstripe/silverstripe-spamprotection.git
synced 2024-10-22 14:05:59 +02:00
Merge branch '3' into 4.0
# Conflicts: # _config.php
This commit is contained in:
commit
e1b4ea2807
@ -1 +0,0 @@
|
||||
<?php
|
@ -40,4 +40,4 @@
|
||||
"license": "BSD-3-Clause",
|
||||
"minimum-stability": "dev",
|
||||
"prefer-stable": true
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user