Antonin c78613481e Merge branch 'master' into develop ... Conflicts: CHANGELOG.md htaccess.txt locale/it.json studs.php tpl/part/vote_table_classic.tpl tpl/part/vote_table_date.tpl		2015-11-30 21:55:56 +01:00
..
de.json	Merge branch 'master' into develop	2015-11-30 21:55:56 +01:00
en.json	Merge branch 'master' into develop	2015-11-30 21:55:56 +01:00
es.json	Merge branch 'master' into develop	2015-11-30 21:55:56 +01:00
fr.json	Merge branch 'master' into develop	2015-11-30 21:55:56 +01:00
it.json	Merge branch 'master' into develop	2015-11-30 21:55:56 +01:00