azett 51bc4cb120 Merge branch 'master' into issue94_smartyupdate ...

# Resolved conflicts:
#	fp-includes/core/includes.php
#	fp-plugins/bbcode/plugin.bbcode.php
#	fp-plugins/commentcenter/inc/admin.php

2022-06-18 12:06:34 +02:00

..

lang

Fixed #100: pt-br had wrong country code

2022-06-17 20:21:58 +02:00

sharedtpls

reverted changes from 354eaccd06a265d557f8c7471bf1fd003ef0aa3c - will have to rework this more thorougly

2022-04-10 13:16:42 +02:00

themes/leggero

Merge branch 'master' into issue94_smartyupdate

2022-06-18 12:06:34 +02:00