Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 15:10:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote branch 'upstream/master'

Browse source 
Conflicts:
	include/bb2diaspora.php
This commit is contained in:
Michael Vogel 2012-07-13 23:39:51 +02:00
commit bfca7f47ef
282 changed files with 35083 additions and 2632 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/dba.php
View file

@ -285,3 +285,9 @@ function dbesc_array(&$arr) {
array_walk($arr,'dbesc_array_cb');
}
}}
function dba_timer() {
return microtime(true);
}