c78613481e
Conflicts: CHANGELOG.md htaccess.txt locale/it.json studs.php tpl/part/vote_table_classic.tpl tpl/part/vote_table_date.tpl |
||
---|---|---|
.. | ||
config.template.php | ||
constants.php | ||
i18n.php | ||
init.php | ||
smarty.php | ||
XXconfig.php |
c78613481e
Conflicts: CHANGELOG.md htaccess.txt locale/it.json studs.php tpl/part/vote_table_classic.tpl tpl/part/vote_table_date.tpl |
||
---|---|---|
.. | ||
config.template.php | ||
constants.php | ||
i18n.php | ||
init.php | ||
smarty.php | ||
XXconfig.php |