Merge remote-tracking branch 'upstream/master'

Conflicts: include/acl_selectors.php
2014-01-13 19:59:34 +01:00
parent 43e916e81a 7c8e2e46d8
commit 17236b1801
13 changed files with 16114 additions and 15536 deletions
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');

 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.2.1747' );
+define ( 'FRIENDICA_VERSION',      '3.2.1748' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1169      );
 define ( 'EOL',                    "<br />\r\n"     );