Skip to content
  • Antonin's avatar
    Merge branch 'master' into develop · c7861348
    Antonin authored
    Conflicts:
    	CHANGELOG.md
    	htaccess.txt
    	locale/it.json
    	studs.php
    	tpl/part/vote_table_classic.tpl
    	tpl/part/vote_table_date.tpl
    c7861348