c78613481e
Conflicts: CHANGELOG.md htaccess.txt locale/it.json studs.php tpl/part/vote_table_classic.tpl tpl/part/vote_table_date.tpl |
||
---|---|---|
.. | ||
classes/Framadate | ||
inc | ||
tests |
c78613481e
Conflicts: CHANGELOG.md htaccess.txt locale/it.json studs.php tpl/part/vote_table_classic.tpl tpl/part/vote_table_date.tpl |
||
---|---|---|
.. | ||
classes/Framadate | ||
inc | ||
tests |