friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into feature/redesign-prototype

Browse source 
# Conflicts:
#	.gitignore
#	.htconfig.php
#	.htconfig.php-dist
#	boot.php
#	include/dba.php
#	mod/health.php
#	util/htconfig.vagrant.php
This commit is contained in:
Hypolite Petovan 2017-04-20 22:33:41 -04:00
commit a8dc2e65f4
183 changed files with 496 additions and 832 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/Scrape.php Executable file → Normal file
View file

@ -183,4 +183,3 @@ function pop_scrape_target(&$array, $name) {
unset($array[$at]);
return count($array);
}}