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
..
2018-10-23 12:24:43 +02:00
2021-11-01 14:21:25 +01:00