clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape

Browse Source
This commit is contained in:
Michael Vogel
2015-02-17 19:18:17 +01:00
parent 05319083c6 fff7a070f9
commit a26d04574d
35 changed files with 28475 additions and 27903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@@ -18,7 +18,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_CODENAME', 'Ginger');
define ( 'FRIENDICA_VERSION', '3.3.3-RC' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1179 );
define ( 'DB_UPDATE_VERSION', 1180 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );