a0657ff619
Conflicts: onyx/include/team/exercice.php onyx/tpl/bootstrap/teams/exercice.tpl |
||
---|---|---|
.. | ||
confirmation.tpl | ||
exercice.tpl | ||
home.tpl | ||
me.tpl | ||
summary.tpl | ||
team.tpl |
a0657ff619
Conflicts: onyx/include/team/exercice.php onyx/tpl/bootstrap/teams/exercice.tpl |
||
---|---|---|
.. | ||
confirmation.tpl | ||
exercice.tpl | ||
home.tpl | ||
me.tpl | ||
summary.tpl | ||
team.tpl |