mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
MINOR Reverted default location for combined JS/CSS as you can't customise this easily
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100534 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
84a7755e4e
commit
bfa13f2404
@ -70,6 +70,3 @@ PasswordEncryptor::register('md5', 'PasswordEncryptor_LegacyPHPHash("md5")');
|
|||||||
PasswordEncryptor::register('sha1','PasswordEncryptor_LegacyPHPHash("sha1")');
|
PasswordEncryptor::register('sha1','PasswordEncryptor_LegacyPHPHash("sha1")');
|
||||||
PasswordEncryptor::register('md5_v2.4', 'PasswordEncryptor_PHPHash("md5")');
|
PasswordEncryptor::register('md5_v2.4', 'PasswordEncryptor_PHPHash("md5")');
|
||||||
PasswordEncryptor::register('sha1_v2.4','PasswordEncryptor_PHPHash("sha1")');
|
PasswordEncryptor::register('sha1_v2.4','PasswordEncryptor_PHPHash("sha1")');
|
||||||
|
|
||||||
// Set the default folder for where combined JS/CSS files should live
|
|
||||||
Requirements::set_combined_files_folder('assets/.combinedfiles');
|
|
Loading…
Reference in New Issue
Block a user