bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'friendica/develop' into issue/#3062

Browse source 
# Conflicts:
#	view/theme/duepuntozero/theme.php
#	view/theme/smoothly/theme.php
This commit is contained in:
Hypolite Petovan 2017-01-12 09:19:59 +11:00
commit b61479ba6e
166 changed files with 835 additions and 789 deletions
Download patch file Download diff file Expand all files Collapse all files

2
view/theme/smoothly/theme.php
View file

@ -10,7 +10,7 @@
* Screenshot: <a href="screenshot.png">Screenshot</a>
*/
function smoothly_init(App &$a) {
function smoothly_init(App $a) {
set_template_engine($a, 'smarty3');
$cssFile = null;