Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

1 files changed, 0 insertions, 3 deletions

diff --git a/boot.php b/boot.php
index 57f41894d..52b1113c1 100755
--- a/boot.php
+++ b/boot.php
@@ -619,9 +619,6 @@ function sys_boot() {
 		define( 'DEFAULT_NOTIFY_ICON', '/images/hz-white-32.png' );
 	}
 
-	if(! defined('CRYPTO_ALGORITHM')) {
-		define( 'CRYPTO_ALGORITHM', 'aes256cbc' );
-	}
 
 	/*
 	 * Try to open the database;