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

2017-03-31 17:27:18 -07:00
parent ecf30b2c71 95f4f14dca
commit 7256579c16
14 changed files with 60 additions and 60 deletions
--- a/boot.php
+++ b/boot.php
@@ -48,7 +48,6 @@ require_once('include/xchan.php');
 require_once('include/hubloc.php');


-
 define ( 'PLATFORM_NAME',           'red' );
 define ( 'STD_VERSION',             '5.3' );

@@ -2301,7 +2300,10 @@ function cert_bad_email() {
 			)
 		]
 	);
+<<<<<<< HEAD

+=======
+>>>>>>> 95f4f14dca1ea982f67cccb31d860f7b8ed9055c
 }