MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	mod/admin.php
This commit is contained in:
Michael Vogel 2014-08-13 00:18:05 +02:00
commit de75d8ca7f
9 changed files with 5829 additions and 5627 deletions
Download patch file Download diff file Expand all files Collapse all files

1
view/templates/admin_site.tpl
View file

@ -108,6 +108,7 @@
{{include file="field_checkbox.tpl" field=$suppress_language}}
<h3>{{$performance}}</h3>
{{include file="field_checkbox.tpl" field=$enable_noscrape}}
{{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
{{include file="field_input.tpl" field=$itemcache}}
{{include file="field_input.tpl" field=$itemcache_duration}}